diff --git a/Makefile b/Makefile
index 83b963340..b0d3b8cb5 100644
--- a/Makefile
+++ b/Makefile
@@ -37,11 +37,11 @@ $(eval $(call validate-option,VERSION,us eu))
 
 ifeq      ($(VERSION),us)
   DEFINES += VERSION_US=1
-  GRUCODE   ?= f3d_old
+  GRUCODE   ?= f3dex_old
   VERSION_ASFLAGS := --defsym VERSION_US=1
 else ifeq ($(VERSION), eu)
   DEFINES += VERSION_EU=1 
-  GRUCODE   ?= f3d_old
+  GRUCODE   ?= f3dex_old
   VERSION_ASFLAGS := --defsym VERSION_EU=1
 endif
 
@@ -57,15 +57,18 @@ BASEROM := baserom.$(VERSION).z64
 
 
 # GRUCODE - selects which RSP microcode to use.
-#   f3d_old - default, version 0.95. An early version of f3d.
-#   f3dex2  - A newer, unsupported version
+#   f3dex_old - default, version 0.95. An early version of F3DEX.
+#   f3dex     - latest version of F3DEX, used on iQue and Lodgenet.
+#   f3dex2    - F3DEX2, currently unsupported.
 # Note that 3/4 player mode uses F3DLX
-$(eval $(call validate-option,GRUCODE,f3d_old f3dex2))
+$(eval $(call validate-option,GRUCODE,f3dex_old f3dex f3dex2))
 
-ifeq ($(GRUCODE), f3dex2) # Fast3DEX2
-  DEFINES += F3DEX_GBI_2 F3DEX_GBI_SHARED=1
-else
+ifeq ($(GRUCODE),f3dex_old) # Fast3DEX 0.95
   DEFINES += F3DEX_GBI=1 F3D_OLD=1
+else ifeq ($(GRUCODE),f3dex) # Fast3DEX 1.23
+  DEFINES += F3DEX_GBI=1 F3DEX_GBI_SHARED=1
+else ifeq ($(GRUCODE),f3dex2) # Fast3DEX2
+  DEFINES += F3DEX_GBI_2=1 F3DEX_GBI_SHARED=1
 endif
 
 
diff --git a/courses/battle/big_donut/packed.inc.c b/courses/battle/big_donut/packed.inc.c
index 2022bed6a..6d9cfd572 100644
--- a/courses/battle/big_donut/packed.inc.c
+++ b/courses/battle/big_donut/packed.inc.c
@@ -21,59 +21,59 @@ Gfx d_course_big_donut_packed_dl_0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000000, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04000200, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04000400, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04000600, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04000800, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04000A00, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -109,59 +109,59 @@ Gfx d_course_big_donut_packed_dl_240[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000C00, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04000E00, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04001000, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04001200, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04001400, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04001600, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -185,197 +185,197 @@ Gfx d_course_big_donut_packed_dl_460[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04001800, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 0, 3, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 18, 21, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 0, 3, 0, 4, 3, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 18, 21, 0, 22, 21, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04001A00, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 8, 11, 13, 0),
-    gsSP1Quadrangle(14, 12, 13, 15, 0),
-    gsSP1Quadrangle(16, 17, 14, 15, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 4, 7, 23, 0),
-    gsSP1Quadrangle(24, 25, 22, 23, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
-    gsSP1Quadrangle(30, 26, 29, 31, 0),
-    gsSP1Quadrangle(20, 30, 31, 21, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 8, 11, 0, 12, 11, 13, 0),
+    gsSP2Triangles(14, 12, 13, 0, 14, 13, 15, 0),
+    gsSP2Triangles(16, 17, 14, 0, 16, 14, 15, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 4, 7, 0, 22, 7, 23, 0),
+    gsSP2Triangles(24, 25, 22, 0, 24, 22, 23, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
+    gsSP2Triangles(30, 26, 29, 0, 30, 29, 31, 0),
+    gsSP2Triangles(20, 30, 31, 0, 20, 31, 21, 0),
     gsSPVertex(0x04001C00, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 8, 11, 13, 0),
-    gsSP1Quadrangle(14, 12, 13, 15, 0),
-    gsSP1Quadrangle(5, 16, 17, 6, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 18, 21, 23, 0),
-    gsSP1Quadrangle(24, 25, 22, 23, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
-    gsSP1Quadrangle(16, 26, 29, 17, 0),
-    gsSP1Quadrangle(30, 31, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 8, 11, 0, 12, 11, 13, 0),
+    gsSP2Triangles(14, 12, 13, 0, 14, 13, 15, 0),
+    gsSP2Triangles(5, 16, 17, 0, 5, 17, 6, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 18, 21, 0, 22, 21, 23, 0),
+    gsSP2Triangles(24, 25, 22, 0, 24, 22, 23, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
+    gsSP2Triangles(16, 26, 29, 0, 16, 29, 17, 0),
+    gsSP2Triangles(30, 31, 14, 0, 30, 14, 15, 0),
     gsSPVertex(0x04001E00, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 4, 7, 9, 0),
-    gsSP1Quadrangle(10, 8, 9, 11, 0),
-    gsSP1Quadrangle(2, 12, 13, 3, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 14, 17, 19, 0),
-    gsSP1Quadrangle(20, 18, 19, 21, 0),
-    gsSP1Quadrangle(22, 20, 21, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 4, 7, 0, 8, 7, 9, 0),
+    gsSP2Triangles(10, 8, 9, 0, 10, 9, 11, 0),
+    gsSP2Triangles(2, 12, 13, 0, 2, 13, 3, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 14, 17, 0, 18, 17, 19, 0),
+    gsSP2Triangles(20, 18, 19, 0, 20, 19, 21, 0),
+    gsSP2Triangles(22, 20, 21, 0, 22, 21, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04002000, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 0, 3, 5, 0),
-    gsSP1Quadrangle(6, 7, 4, 5, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(1, 12, 13, 2, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 14, 17, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 24, 27, 0),
-    gsSP1Quadrangle(30, 8, 11, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 0, 3, 0, 4, 3, 5, 0),
+    gsSP2Triangles(6, 7, 4, 0, 6, 4, 5, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(1, 12, 13, 0, 1, 13, 2, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 14, 0, 18, 14, 17, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 24, 0, 28, 24, 27, 0),
+    gsSP2Triangles(30, 8, 11, 0, 30, 11, 31, 0),
     gsSPVertex(0x04002200, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 0, 3, 5, 0),
-    gsSP1Quadrangle(6, 4, 5, 7, 0),
-    gsSP1Quadrangle(8, 9, 6, 7, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 14, 17, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 20, 23, 25, 0),
-    gsSP1Quadrangle(12, 24, 25, 13, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 0, 3, 0, 4, 3, 5, 0),
+    gsSP2Triangles(6, 4, 5, 0, 6, 5, 7, 0),
+    gsSP2Triangles(8, 9, 6, 0, 8, 6, 7, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 14, 0, 18, 14, 17, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 20, 23, 0, 24, 23, 25, 0),
+    gsSP2Triangles(12, 24, 25, 0, 12, 25, 13, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPVertex(0x040023E0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 4, 7, 9, 0),
-    gsSP1Quadrangle(10, 8, 9, 11, 0),
-    gsSP1Quadrangle(2, 12, 13, 3, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 14, 17, 19, 0),
-    gsSP1Quadrangle(20, 21, 18, 19, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(12, 22, 25, 13, 0),
-    gsSP1Quadrangle(26, 27, 10, 11, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 4, 7, 0, 8, 7, 9, 0),
+    gsSP2Triangles(10, 8, 9, 0, 10, 9, 11, 0),
+    gsSP2Triangles(2, 12, 13, 0, 2, 13, 3, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 14, 17, 0, 18, 17, 19, 0),
+    gsSP2Triangles(20, 21, 18, 0, 20, 18, 19, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(12, 22, 25, 0, 12, 25, 13, 0),
+    gsSP2Triangles(26, 27, 10, 0, 26, 10, 11, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x040025E0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 4, 7, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 14, 17, 19, 0),
-    gsSP1Quadrangle(20, 18, 19, 21, 0),
-    gsSP1Quadrangle(22, 23, 20, 21, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 4, 0, 8, 4, 7, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 14, 17, 0, 18, 17, 19, 0),
+    gsSP2Triangles(20, 18, 19, 0, 20, 19, 21, 0),
+    gsSP2Triangles(22, 23, 20, 0, 22, 20, 21, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x040027E0, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 0, 3, 5, 0),
-    gsSP1Quadrangle(6, 4, 5, 7, 0),
-    gsSP1Quadrangle(8, 9, 6, 7, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 14, 17, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 24, 27, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 0, 3, 0, 4, 3, 5, 0),
+    gsSP2Triangles(6, 4, 5, 0, 6, 5, 7, 0),
+    gsSP2Triangles(8, 9, 6, 0, 8, 6, 7, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 14, 17, 0, 18, 17, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 24, 27, 0, 28, 27, 29, 0),
     gsSPVertex(0x040029C0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 8, 11, 13, 0),
-    gsSP1Quadrangle(14, 12, 13, 15, 0),
-    gsSP1Quadrangle(6, 16, 17, 7, 0),
-    gsSP1Quadrangle(18, 0, 3, 19, 0),
-    gsSP1Quadrangle(20, 18, 19, 21, 0),
-    gsSP1Quadrangle(22, 23, 20, 21, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(16, 24, 27, 17, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 8, 11, 0, 12, 11, 13, 0),
+    gsSP2Triangles(14, 12, 13, 0, 14, 13, 15, 0),
+    gsSP2Triangles(6, 16, 17, 0, 6, 17, 7, 0),
+    gsSP2Triangles(18, 0, 3, 0, 18, 3, 19, 0),
+    gsSP2Triangles(20, 18, 19, 0, 20, 19, 21, 0),
+    gsSP2Triangles(22, 23, 20, 0, 22, 20, 21, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(16, 24, 27, 0, 16, 27, 17, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04002BC0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 0, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 6, 9, 11, 0),
-    gsSP1Quadrangle(1, 12, 13, 2, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 14, 17, 19, 0),
-    gsSP1Quadrangle(20, 18, 19, 21, 0),
-    gsSP1Quadrangle(22, 23, 20, 21, 0),
-    gsSP1Quadrangle(12, 24, 25, 13, 0),
-    gsSP1Quadrangle(26, 10, 11, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 0, 0, 4, 0, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 6, 9, 0, 10, 9, 11, 0),
+    gsSP2Triangles(1, 12, 13, 0, 1, 13, 2, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 14, 17, 0, 18, 17, 19, 0),
+    gsSP2Triangles(20, 18, 19, 0, 20, 19, 21, 0),
+    gsSP2Triangles(22, 23, 20, 0, 22, 20, 21, 0),
+    gsSP2Triangles(12, 24, 25, 0, 12, 25, 13, 0),
+    gsSP2Triangles(26, 10, 11, 0, 26, 11, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04002DC0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 4, 7, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 18, 21, 23, 0),
-    gsSP1Quadrangle(24, 22, 23, 25, 0),
-    gsSP1Quadrangle(26, 24, 25, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 4, 7, 0, 8, 7, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 18, 21, 0, 22, 21, 23, 0),
+    gsSP2Triangles(24, 22, 23, 0, 24, 23, 25, 0),
+    gsSP2Triangles(26, 24, 25, 0, 26, 25, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04002FC0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 0, 3, 5, 0),
-    gsSP1Quadrangle(6, 7, 4, 5, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(1, 12, 13, 2, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
-    gsSP1Quadrangle(30, 26, 29, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 0, 3, 0, 4, 3, 5, 0),
+    gsSP2Triangles(6, 7, 4, 0, 6, 4, 5, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(1, 12, 13, 0, 1, 13, 2, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
+    gsSP2Triangles(30, 26, 29, 0, 30, 29, 31, 0),
     gsSPVertex(0x040031C0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 4, 7, 9, 0),
-    gsSP1Quadrangle(10, 8, 9, 11, 0),
-    gsSP1Quadrangle(12, 10, 11, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 0, 3, 19, 0),
-    gsSP1Quadrangle(20, 18, 19, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 22, 25, 27, 0),
-    gsSP1Quadrangle(16, 26, 27, 17, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 4, 7, 0, 8, 7, 9, 0),
+    gsSP2Triangles(10, 8, 9, 0, 10, 9, 11, 0),
+    gsSP2Triangles(12, 10, 11, 0, 12, 11, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 0, 3, 0, 18, 3, 19, 0),
+    gsSP2Triangles(20, 18, 19, 0, 20, 19, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 22, 25, 0, 26, 25, 27, 0),
+    gsSP2Triangles(16, 26, 27, 0, 16, 27, 17, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x040033C0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 0, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 6, 9, 11, 0),
-    gsSP1Quadrangle(1, 12, 13, 2, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 14, 17, 19, 0),
-    gsSP1Quadrangle(20, 18, 19, 21, 0),
-    gsSP1Quadrangle(22, 23, 20, 21, 0),
-    gsSP1Quadrangle(12, 24, 25, 13, 0),
-    gsSP1Quadrangle(26, 10, 11, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 0, 0, 4, 0, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 6, 9, 0, 10, 9, 11, 0),
+    gsSP2Triangles(1, 12, 13, 0, 1, 13, 2, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 14, 17, 0, 18, 17, 19, 0),
+    gsSP2Triangles(20, 18, 19, 0, 20, 19, 21, 0),
+    gsSP2Triangles(22, 23, 20, 0, 22, 20, 21, 0),
+    gsSP2Triangles(12, 24, 25, 0, 12, 25, 13, 0),
+    gsSP2Triangles(26, 10, 11, 0, 26, 11, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x040035C0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 8, 11, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 22, 25, 27, 0),
-    gsSP1Quadrangle(28, 26, 27, 29, 0),
-    gsSP1Quadrangle(30, 28, 29, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 8, 11, 0, 12, 11, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 22, 25, 0, 26, 25, 27, 0),
+    gsSP2Triangles(28, 26, 27, 0, 28, 27, 29, 0),
+    gsSP2Triangles(30, 28, 29, 0, 30, 29, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -401,7 +401,7 @@ Gfx d_course_big_donut_packed_dl_AD0[] =
     gsSPVertex(0x040037C0, 9, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
     gsSP2Triangles(3, 4, 2, 0, 4, 5, 2, 0),
-    gsSP1Quadrangle(2, 5, 6, 7, 0),
+    gsSP2Triangles(2, 5, 6, 0, 2, 6, 7, 0),
     gsSP2Triangles(7, 8, 2, 0, 8, 0, 2, 0),
     gsSPEndDisplayList(),
 };
@@ -420,50 +420,50 @@ Gfx d_course_big_donut_packed_dl_B58[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04003850, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04003A50, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04003C50, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04003E50, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04004050, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -480,23 +480,23 @@ Gfx d_course_big_donut_packed_dl_D38[] =
     gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x04004250, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 0, 3, 5, 0),
-    gsSP1Quadrangle(1, 6, 7, 2, 0),
-    gsSP1Quadrangle(4, 5, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(12, 14, 15, 13, 0),
-    gsSP1Quadrangle(14, 16, 17, 15, 0),
-    gsSP1Quadrangle(16, 18, 19, 17, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 20, 23, 25, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(27, 26, 28, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 0, 3, 0, 4, 3, 5, 0),
+    gsSP2Triangles(1, 6, 7, 0, 1, 7, 2, 0),
+    gsSP2Triangles(4, 5, 8, 0, 4, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(12, 14, 15, 0, 12, 15, 13, 0),
+    gsSP2Triangles(14, 16, 17, 0, 14, 17, 15, 0),
+    gsSP2Triangles(16, 18, 19, 0, 16, 19, 17, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 20, 23, 0, 24, 23, 25, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(27, 26, 28, 0, 27, 28, 29, 0),
     gsSPVertex(0x04004430, 10, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 0, 3, 5, 0),
-    gsSP1Quadrangle(6, 7, 4, 5, 0),
-    gsSP1Quadrangle(8, 9, 7, 6, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 0, 3, 0, 4, 3, 5, 0),
+    gsSP2Triangles(6, 7, 4, 0, 6, 4, 5, 0),
+    gsSP2Triangles(8, 9, 7, 0, 8, 7, 6, 0),
     gsSPEndDisplayList(),
 };
 
@@ -520,10 +520,10 @@ Gfx d_course_big_donut_packed_dl_DF8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040044D0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -541,10 +541,10 @@ Gfx d_course_big_donut_packed_dl_E80[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040045D0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -562,10 +562,10 @@ Gfx d_course_big_donut_packed_dl_F08[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040046D0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -583,10 +583,10 @@ Gfx d_course_big_donut_packed_dl_F90[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040047D0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
diff --git a/courses/battle/block_fort/model.inc.c b/courses/battle/block_fort/model.inc.c
index 05dba23f0..8d822947f 100644
--- a/courses/battle/block_fort/model.inc.c
+++ b/courses/battle/block_fort/model.inc.c
@@ -1111,8 +1111,8 @@ int d_course_block_fort_packed[] = {
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000030, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 4, 7, 0, 9, 10, 11, 0),
     gsSP2Triangles(9, 11, 12, 0, 13, 10, 9, 0),
     gsSP2Triangles(11, 14, 12, 0, 15, 16, 17, 0),
diff --git a/courses/battle/block_fort/packed.inc.c b/courses/battle/block_fort/packed.inc.c
index 783df6e38..95e89ef07 100644
--- a/courses/battle/block_fort/packed.inc.c
+++ b/courses/battle/block_fort/packed.inc.c
@@ -24,8 +24,8 @@ Gfx d_course_block_fort_packed_dl_0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000030, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 4, 7, 0, 9, 10, 11, 0),
     gsSP2Triangles(9, 11, 12, 0, 13, 10, 9, 0),
     gsSP2Triangles(11, 14, 12, 0, 15, 16, 17, 0),
@@ -47,8 +47,8 @@ Gfx d_course_block_fort_packed_dl_B8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000170, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(4, 7, 8, 0, 7, 9, 8, 0),
     gsSP2Triangles(10, 11, 12, 0, 12, 13, 14, 0),
     gsSP2Triangles(12, 14, 10, 0, 13, 15, 14, 0),
@@ -69,10 +69,10 @@ Gfx d_course_block_fort_packed_dl_148[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000270, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 5, 4, 7, 0),
     gsSP2Triangles(5, 7, 8, 0, 7, 9, 8, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
     gsSP2Triangles(10, 13, 14, 0, 11, 15, 12, 0),
     gsSPEndDisplayList(),
 };
@@ -91,7 +91,7 @@ Gfx d_course_block_fort_packed_dl_1D8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000370, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 5, 7, 8, 0),
     gsSP2Triangles(5, 8, 6, 0, 8, 7, 9, 0),
     gsSP2Triangles(10, 11, 12, 0, 11, 13, 14, 0),
@@ -113,18 +113,18 @@ Gfx d_course_block_fort_packed_dl_268[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000470, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 10, 9, 0),
-    gsSP1Quadrangle(12, 14, 15, 13, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 10, 0, 12, 10, 9, 0),
+    gsSP2Triangles(12, 14, 15, 0, 12, 15, 13, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04000670, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -142,17 +142,17 @@ Gfx d_course_block_fort_packed_dl_330[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040006F0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 24, 25, 26, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 24, 25, 0, 24, 25, 26, 0),
     gsSP2Triangles(24, 26, 27, 0, 28, 29, 30, 0),
     gsSP1Triangle(28, 30, 31, 0),
     gsSPVertex(0x040008F0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -181,12 +181,12 @@ Gfx d_course_block_fort_packed_dl_428[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000930, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -204,12 +204,12 @@ Gfx d_course_block_fort_packed_dl_4C0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000AB0, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -227,12 +227,12 @@ Gfx d_course_block_fort_packed_dl_558[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000C30, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 5, 4, 13, 0),
-    gsSP1Quadrangle(14, 8, 11, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 5, 4, 0, 12, 4, 13, 0),
+    gsSP2Triangles(14, 8, 11, 0, 14, 11, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -250,12 +250,12 @@ Gfx d_course_block_fort_packed_dl_5F0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000D70, 18, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 0, 3, 13, 0),
-    gsSP1Quadrangle(14, 4, 7, 15, 0),
-    gsSP1Quadrangle(16, 10, 9, 17, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 0, 3, 0, 12, 3, 13, 0),
+    gsSP2Triangles(14, 4, 7, 0, 14, 7, 15, 0),
+    gsSP2Triangles(16, 10, 9, 0, 16, 9, 17, 0),
     gsSPEndDisplayList(),
 };
 
@@ -282,23 +282,23 @@ Gfx d_course_block_fort_packed_dl_6B0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000E90, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04001090, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -316,10 +316,10 @@ Gfx d_course_block_fort_packed_dl_7A0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04001290, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -337,10 +337,10 @@ Gfx d_course_block_fort_packed_dl_828[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04001390, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -358,10 +358,10 @@ Gfx d_course_block_fort_packed_dl_8B0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04001490, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -379,10 +379,10 @@ Gfx d_course_block_fort_packed_dl_938[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04001590, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -410,19 +410,19 @@ Gfx d_course_block_fort_packed_dl_9F0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04001690, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05000000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04001750, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(10, 12, 13, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(10, 12, 13, 0, 10, 13, 11, 0),
     gsSP2Triangles(14, 15, 16, 0, 17, 18, 19, 0),
     gsSP2Triangles(17, 19, 20, 0, 21, 22, 23, 0),
     gsSP2Triangles(24, 25, 26, 0, 27, 28, 24, 0),
@@ -431,38 +431,38 @@ Gfx d_course_block_fort_packed_dl_9F0[] =
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(3, 5, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(7, 9, 10, 0, 11, 12, 13, 0),
-    gsSP1Quadrangle(11, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(11, 13, 14, 0, 11, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSP2Triangles(24, 20, 23, 0, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04001B50, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05001000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04001D50, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(0, 3, 4, 0, 5, 6, 7, 0),
     gsSP2Triangles(5, 7, 8, 0, 9, 8, 7, 0),
-    gsSP1Quadrangle(10, 11, 9, 7, 0),
-    gsSP1Quadrangle(12, 11, 10, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
+    gsSP2Triangles(10, 11, 9, 0, 10, 9, 7, 0),
+    gsSP2Triangles(12, 11, 10, 0, 12, 10, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
     gsSP2Triangles(15, 18, 16, 0, 19, 20, 12, 0),
     gsSP2Triangles(19, 12, 13, 0, 21, 19, 13, 0),
     gsSP2Triangles(21, 13, 22, 0, 23, 24, 25, 0),
     gsSP2Triangles(24, 26, 25, 0, 26, 27, 25, 0),
-    gsSP1Quadrangle(28, 23, 25, 29, 0),
-    gsSP1Quadrangle(30, 28, 29, 31, 0),
+    gsSP2Triangles(28, 23, 25, 0, 28, 25, 29, 0),
+    gsSP2Triangles(30, 28, 29, 0, 30, 29, 31, 0),
     gsSPVertex(0x04001F50, 13, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 0, 2, 0),
     gsSP2Triangles(3, 2, 4, 0, 5, 6, 7, 0),
@@ -474,10 +474,10 @@ Gfx d_course_block_fort_packed_dl_9F0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04002020, 11, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(0, 3, 4, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0),
     gsSP2Triangles(4, 6, 5, 0, 7, 8, 9, 0),
-    gsSP1Quadrangle(7, 9, 10, 5, 0),
+    gsSP2Triangles(7, 9, 10, 0, 7, 10, 5, 0),
     gsSP1Triangle(7, 5, 6, 0),
     gsSPEndDisplayList(),
 };
@@ -496,41 +496,41 @@ Gfx d_course_block_fort_packed_dl_C80[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040020D0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05000000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04002190, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(0, 3, 4, 0, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04002390, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(10, 12, 13, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(10, 12, 13, 0, 10, 13, 11, 0),
     gsSP2Triangles(14, 15, 16, 0, 17, 18, 19, 0),
     gsSP2Triangles(17, 19, 20, 0, 19, 21, 20, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
     gsSP2Triangles(26, 27, 28, 0, 29, 30, 31, 0),
     gsSPVertex(0x04002590, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(3, 5, 6, 0, 7, 3, 6, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05001000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
@@ -541,14 +541,14 @@ Gfx d_course_block_fort_packed_dl_C80[] =
     gsSP2Triangles(2, 1, 3, 0, 5, 0, 2, 0),
     gsSP2Triangles(5, 2, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(7, 9, 10, 0, 7, 11, 8, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(14, 13, 16, 17, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(14, 13, 16, 0, 14, 16, 17, 0),
     gsSP2Triangles(16, 18, 17, 0, 19, 20, 21, 0),
     gsSP2Triangles(19, 21, 22, 0, 21, 23, 22, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 5, 6, 29, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 5, 6, 0, 28, 6, 29, 0),
     gsSPVertex(0x04002970, 19, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(1, 4, 2, 0, 5, 6, 7, 0),
     gsSP2Triangles(5, 7, 8, 0, 7, 9, 10, 0),
     gsSP2Triangles(7, 10, 8, 0, 11, 12, 13, 0),
@@ -560,10 +560,10 @@ Gfx d_course_block_fort_packed_dl_C80[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04002AA0, 11, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(0, 3, 4, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0),
     gsSP2Triangles(0, 5, 6, 0, 1, 7, 8, 0),
-    gsSP1Quadrangle(1, 8, 9, 10, 0),
+    gsSP2Triangles(1, 8, 9, 0, 1, 9, 10, 0),
     gsSP1Triangle(1, 10, 2, 0),
     gsSPEndDisplayList(),
 };
@@ -582,60 +582,60 @@ Gfx d_course_block_fort_packed_dl_F10[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04002B50, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05000000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04002C10, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(6, 8, 9, 7, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(6, 8, 9, 0, 6, 9, 7, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
     gsSP2Triangles(18, 14, 17, 0, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPVertex(0x04002DF0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSP2Triangles(14, 16, 15, 0, 17, 18, 19, 0),
-    gsSP1Quadrangle(17, 19, 20, 21, 0),
+    gsSP2Triangles(17, 19, 20, 0, 17, 20, 21, 0),
     gsSP2Triangles(22, 23, 24, 0, 25, 26, 27, 0),
     gsSP2Triangles(25, 27, 28, 0, 29, 30, 31, 0),
     gsSPVertex(0x04002FF0, 30, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(3, 5, 6, 0, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPVertex(0x040031D0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05001000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04003210, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 0, 4, 5, 0),
-    gsSP1Quadrangle(4, 6, 7, 5, 0),
-    gsSP1Quadrangle(8, 9, 6, 4, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 0, 4, 0, 1, 4, 5, 0),
+    gsSP2Triangles(4, 6, 7, 0, 4, 7, 5, 0),
+    gsSP2Triangles(8, 9, 6, 0, 8, 6, 4, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
     gsSP2Triangles(11, 14, 12, 0, 2, 15, 3, 0),
-    gsSP1Quadrangle(16, 17, 3, 15, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
+    gsSP2Triangles(16, 17, 3, 0, 16, 3, 15, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
     gsSP2Triangles(18, 22, 19, 0, 23, 24, 25, 0),
     gsSP2Triangles(24, 26, 25, 0, 27, 23, 25, 0),
-    gsSP1Quadrangle(28, 27, 25, 29, 0),
-    gsSP1Quadrangle(30, 28, 29, 31, 0),
+    gsSP2Triangles(28, 27, 25, 0, 28, 25, 29, 0),
+    gsSP2Triangles(30, 28, 29, 0, 30, 29, 31, 0),
     gsSPVertex(0x04003410, 13, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 0, 2, 0),
     gsSP2Triangles(3, 2, 4, 0, 5, 6, 7, 0),
@@ -648,9 +648,9 @@ Gfx d_course_block_fort_packed_dl_F10[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040034E0, 11, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(3, 5, 6, 0, 0),
+    gsSP2Triangles(3, 5, 6, 0, 3, 6, 0, 0),
     gsSP2Triangles(3, 0, 2, 0, 2, 1, 7, 0),
-    gsSP1Quadrangle(2, 7, 8, 9, 0),
+    gsSP2Triangles(2, 7, 8, 0, 2, 8, 9, 0),
     gsSP1Triangle(2, 9, 10, 0),
     gsSPEndDisplayList(),
 };
@@ -669,70 +669,70 @@ Gfx d_course_block_fort_packed_dl_11A8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04003590, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05000000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04003650, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(4, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(4, 7, 8, 0, 4, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
     gsSP2Triangles(22, 23, 24, 0, 25, 26, 27, 0),
     gsSP2Triangles(25, 27, 28, 0, 29, 30, 31, 0),
     gsSPVertex(0x04003850, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 11, 12, 13, 0),
     gsSP2Triangles(11, 13, 14, 0, 13, 15, 16, 0),
-    gsSP1Quadrangle(13, 16, 17, 18, 0),
-    gsSP1Quadrangle(13, 18, 19, 20, 0),
+    gsSP2Triangles(13, 16, 17, 0, 13, 17, 18, 0),
+    gsSP2Triangles(13, 18, 19, 0, 13, 19, 20, 0),
     gsSP2Triangles(13, 20, 14, 0, 21, 22, 23, 0),
     gsSP2Triangles(21, 23, 24, 0, 23, 25, 24, 0),
     gsSP2Triangles(26, 27, 28, 0, 29, 30, 31, 0),
     gsSPVertex(0x04003A50, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(8, 11, 12, 13, 0),
-    gsSP1Quadrangle(8, 13, 14, 15, 0),
-    gsSP1Quadrangle(8, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(8, 11, 12, 0, 8, 12, 13, 0),
+    gsSP2Triangles(8, 13, 14, 0, 8, 14, 15, 0),
+    gsSP2Triangles(8, 15, 16, 0, 8, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPVertex(0x04003C30, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05001000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04003D30, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(0, 4, 1, 0, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 5, 7, 9, 0),
+    gsSP2Triangles(8, 5, 7, 0, 8, 7, 9, 0),
     gsSP2Triangles(7, 10, 11, 0, 7, 6, 10, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 12, 15, 0),
-    gsSP1Quadrangle(14, 18, 19, 20, 0),
-    gsSP1Quadrangle(14, 20, 21, 15, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(21, 20, 26, 27, 0),
-    gsSP1Quadrangle(21, 27, 28, 29, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 12, 0, 16, 12, 15, 0),
+    gsSP2Triangles(14, 18, 19, 0, 14, 19, 20, 0),
+    gsSP2Triangles(14, 20, 21, 0, 14, 21, 15, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(21, 20, 26, 0, 21, 26, 27, 0),
+    gsSP2Triangles(21, 27, 28, 0, 21, 28, 29, 0),
     gsSP2Triangles(21, 29, 30, 0, 29, 31, 30, 0),
     gsSPVertex(0x04003F30, 23, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsSP2Triangles(7, 10, 8, 0, 11, 12, 13, 0),
     gsSP2Triangles(11, 13, 14, 0, 15, 16, 17, 0),
     gsSP2Triangles(15, 17, 18, 0, 19, 20, 21, 0),
@@ -743,13 +743,13 @@ Gfx d_course_block_fort_packed_dl_11A8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040040A0, 17, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(0, 3, 4, 5, 0),
-    gsSP1Quadrangle(0, 5, 6, 7, 0),
-    gsSP1Quadrangle(0, 7, 8, 9, 0),
-    gsSP1Quadrangle(0, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0),
+    gsSP2Triangles(0, 5, 6, 0, 0, 6, 7, 0),
+    gsSP2Triangles(0, 7, 8, 0, 0, 8, 9, 0),
+    gsSP2Triangles(0, 9, 10, 0, 0, 10, 11, 0),
     gsSP2Triangles(0, 11, 12, 0, 4, 3, 13, 0),
-    gsSP1Quadrangle(4, 13, 14, 15, 0),
+    gsSP2Triangles(4, 13, 14, 0, 4, 14, 15, 0),
     gsSP1Triangle(4, 15, 16, 0),
     gsSPEndDisplayList(),
 };
@@ -768,25 +768,25 @@ Gfx d_course_block_fort_packed_dl_14C8[] =
     gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x040041B0, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 0, 3, 5, 0),
-    gsSP1Quadrangle(1, 6, 7, 2, 0),
-    gsSP1Quadrangle(6, 8, 9, 7, 0),
-    gsSP1Quadrangle(8, 10, 11, 9, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 0, 3, 0, 4, 3, 5, 0),
+    gsSP2Triangles(1, 6, 7, 0, 1, 7, 2, 0),
+    gsSP2Triangles(6, 8, 9, 0, 6, 9, 7, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0),
     gsSP2Triangles(8, 12, 13, 0, 8, 4, 12, 0),
-    gsSP1Quadrangle(14, 4, 5, 15, 0),
-    gsSP1Quadrangle(16, 14, 15, 17, 0),
+    gsSP2Triangles(14, 4, 5, 0, 14, 5, 15, 0),
+    gsSP2Triangles(16, 14, 15, 0, 16, 15, 17, 0),
     gsSP2Triangles(12, 4, 18, 0, 19, 13, 20, 0),
     gsSP2Triangles(19, 20, 21, 0, 22, 19, 21, 0),
     gsSP2Triangles(22, 21, 23, 0, 12, 18, 13, 0),
-    gsSP1Quadrangle(13, 24, 25, 20, 0),
-    gsSP1Quadrangle(10, 22, 23, 11, 0),
-    gsSP1Quadrangle(26, 16, 17, 27, 0),
-    gsSP1Quadrangle(18, 26, 27, 28, 0),
-    gsSP1Quadrangle(29, 18, 28, 30, 0),
+    gsSP2Triangles(13, 24, 25, 0, 13, 25, 20, 0),
+    gsSP2Triangles(10, 22, 23, 0, 10, 23, 11, 0),
+    gsSP2Triangles(26, 16, 17, 0, 26, 17, 27, 0),
+    gsSP2Triangles(18, 26, 27, 0, 18, 27, 28, 0),
+    gsSP2Triangles(29, 18, 28, 0, 29, 28, 30, 0),
     gsSPVertex(0x040043A0, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
     gsSPEndDisplayList(),
 };
 
diff --git a/courses/battle/double_deck/packed.inc.c b/courses/battle/double_deck/packed.inc.c
index 6f598e110..e576b146d 100644
--- a/courses/battle/double_deck/packed.inc.c
+++ b/courses/battle/double_deck/packed.inc.c
@@ -20,59 +20,59 @@ Gfx d_course_double_deck_packed_dl_0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000000, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04000200, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04000400, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04000600, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04000800, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04000A00, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -90,39 +90,39 @@ Gfx d_course_double_deck_packed_dl_210[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000C00, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(0, 3, 4, 0, 5, 6, 7, 0),
     gsSP2Triangles(5, 7, 8, 0, 9, 10, 11, 0),
     gsSP2Triangles(9, 11, 12, 0, 13, 14, 15, 0),
     gsSP2Triangles(13, 15, 16, 0, 17, 18, 19, 0),
     gsSP2Triangles(17, 19, 20, 0, 18, 21, 19, 0),
-    gsSP1Quadrangle(19, 22, 23, 20, 0),
+    gsSP2Triangles(19, 22, 23, 0, 19, 23, 20, 0),
     gsSP2Triangles(17, 20, 24, 0, 25, 26, 27, 0),
-    gsSP1Quadrangle(25, 27, 28, 29, 0),
-    gsSP1Quadrangle(27, 30, 31, 28, 0),
+    gsSP2Triangles(25, 27, 28, 0, 25, 28, 29, 0),
+    gsSP2Triangles(27, 30, 31, 0, 27, 31, 28, 0),
     gsSPVertex(0x04000E00, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(6, 3, 5, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(6, 3, 5, 0, 6, 5, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSP2Triangles(8, 11, 12, 0, 10, 13, 14, 0),
     gsSP2Triangles(10, 14, 11, 0, 15, 16, 17, 0),
     gsSP2Triangles(15, 17, 18, 0, 19, 15, 18, 0),
     gsSP2Triangles(16, 20, 17, 0, 20, 16, 21, 0),
     gsSP2Triangles(11, 22, 12, 0, 23, 24, 25, 0),
     gsSP2Triangles(23, 25, 26, 0, 15, 19, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSP1Triangle(28, 31, 28, 0),
     gsSPVertex(0x04001000, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(0, 4, 5, 6, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(0, 4, 5, 0, 0, 5, 6, 0),
     gsSP2Triangles(0, 3, 4, 0, 7, 8, 9, 0),
-    gsSP1Quadrangle(8, 7, 10, 11, 0),
+    gsSP2Triangles(8, 7, 10, 0, 8, 10, 11, 0),
     gsSP2Triangles(8, 11, 12, 0, 13, 14, 15, 0),
     gsSP2Triangles(13, 15, 16, 0, 17, 18, 16, 0),
     gsSP2Triangles(17, 16, 15, 0, 5, 19, 6, 0),
-    gsSP1Quadrangle(4, 20, 21, 5, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(25, 24, 26, 27, 0),
+    gsSP2Triangles(4, 20, 21, 0, 4, 21, 5, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(25, 24, 26, 0, 25, 26, 27, 0),
     gsSP2Triangles(25, 27, 28, 0, 29, 30, 31, 0),
     gsSPVertex(0x04001200, 5, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 0, 2, 0),
@@ -151,50 +151,50 @@ Gfx d_course_double_deck_packed_dl_3B8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04001250, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04001450, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04001650, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04001850, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04001A50, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -216,25 +216,25 @@ Gfx d_course_double_deck_packed_dl_580[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04001C80, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(8, 7, 10, 0, 11, 12, 13, 0),
-    gsSP1Quadrangle(11, 14, 15, 12, 0),
+    gsSP2Triangles(11, 14, 15, 0, 11, 15, 12, 0),
     gsSP2Triangles(16, 17, 18, 0, 17, 16, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(16, 8, 10, 28, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(16, 8, 10, 0, 16, 10, 28, 0),
     gsSP2Triangles(16, 28, 19, 0, 29, 30, 31, 0),
     gsSPVertex(0x04001E80, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(3, 5, 6, 0, 7, 8, 9, 0),
-    gsSP1Quadrangle(7, 9, 10, 7, 0),
-    gsSP1Quadrangle(11, 12, 13, 14, 0),
+    gsSP2Triangles(7, 9, 10, 0, 7, 10, 7, 0),
+    gsSP2Triangles(11, 12, 13, 0, 11, 13, 14, 0),
     gsSP2Triangles(11, 15, 12, 0, 16, 17, 13, 0),
     gsSP2Triangles(16, 13, 12, 0, 18, 19, 20, 0),
     gsSP2Triangles(18, 20, 21, 0, 19, 22, 23, 0),
     gsSP2Triangles(19, 23, 20, 0, 24, 25, 26, 0),
-    gsSP1Quadrangle(24, 26, 27, 28, 0),
+    gsSP2Triangles(24, 26, 27, 0, 24, 27, 28, 0),
     gsSP1Triangle(29, 30, 31, 0),
     gsSPVertex(0x04002080, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
@@ -243,7 +243,7 @@ Gfx d_course_double_deck_packed_dl_580[] =
     gsSP2Triangles(11, 13, 14, 0, 15, 16, 14, 0),
     gsSP2Triangles(15, 14, 13, 0, 17, 18, 19, 0),
     gsSP2Triangles(17, 19, 20, 0, 21, 22, 23, 0),
-    gsSP1Quadrangle(21, 24, 25, 22, 0),
+    gsSP2Triangles(21, 24, 25, 0, 21, 25, 22, 0),
     gsSP2Triangles(26, 21, 23, 0, 24, 27, 25, 0),
     gsSP2Triangles(24, 28, 27, 0, 29, 30, 31, 0),
     gsSPVertex(0x04002280, 3, 0),
diff --git a/courses/battle/skyscraper/packed.inc.c b/courses/battle/skyscraper/packed.inc.c
index 823624e64..190322987 100644
--- a/courses/battle/skyscraper/packed.inc.c
+++ b/courses/battle/skyscraper/packed.inc.c
@@ -20,64 +20,64 @@ Gfx d_course_skyscraper_packed_dl_0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000000, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04000200, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04000400, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04000600, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSP2Triangles(24, 25, 26, 0, 27, 24, 26, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04000800, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 0, 2, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSP2Triangles(20, 21, 22, 0, 23, 20, 22, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04000A00, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSP2Triangles(28, 29, 30, 0, 29, 31, 30, 0),
     gsSPVertex(0x04000C00, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -113,37 +113,37 @@ Gfx d_course_skyscraper_packed_dl_268[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000D00, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(0, 8, 9, 10, 0),
-    gsSP1Quadrangle(11, 12, 13, 14, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(0, 8, 9, 0, 0, 9, 10, 0),
+    gsSP2Triangles(11, 12, 13, 0, 11, 13, 14, 0),
     gsSP2Triangles(15, 16, 17, 0, 18, 19, 20, 0),
     gsSP2Triangles(18, 20, 21, 0, 22, 23, 24, 0),
     gsSP2Triangles(22, 24, 25, 0, 26, 27, 28, 0),
-    gsSP1Quadrangle(26, 29, 30, 31, 0),
+    gsSP2Triangles(26, 29, 30, 0, 26, 30, 31, 0),
     gsSPVertex(0x04000F00, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(6, 7, 8, 0, 9, 10, 11, 0),
     gsSP2Triangles(12, 1, 13, 0, 14, 4, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 19, 20, 21, 0),
     gsSP2Triangles(19, 21, 22, 0, 23, 24, 25, 0),
-    gsSP1Quadrangle(23, 26, 27, 28, 0),
-    gsSP1Quadrangle(16, 29, 30, 31, 0),
+    gsSP2Triangles(23, 26, 27, 0, 23, 27, 28, 0),
+    gsSP2Triangles(16, 29, 30, 0, 16, 30, 31, 0),
     gsSPVertex(0x04001100, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(7, 10, 11, 0, 12, 13, 14, 0),
     gsSP2Triangles(15, 16, 17, 0, 15, 18, 19, 0),
     gsSP2Triangles(20, 21, 22, 0, 15, 23, 24, 0),
     gsSP2Triangles(25, 26, 27, 0, 28, 29, 30, 0),
     gsSPVertex(0x040012F0, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 11, 12, 13, 0),
     gsSP2Triangles(14, 15, 16, 0, 14, 17, 18, 0),
     gsSP2Triangles(14, 18, 19, 0, 20, 21, 22, 0),
     gsSP2Triangles(20, 22, 23, 0, 24, 25, 26, 0),
-    gsSP1Quadrangle(27, 28, 29, 30, 0),
+    gsSP2Triangles(27, 28, 29, 0, 27, 29, 30, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -153,28 +153,28 @@ Gfx d_course_skyscraper_packed_dl_268[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040014E0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500E800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04001520, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500F000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04001560, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500F800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040015A0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -188,15 +188,15 @@ Gfx d_course_skyscraper_packed_dl_268[] =
     gsSP2Triangles(6, 7, 8, 0, 9, 10, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 15, 16, 17, 0),
     gsSP2Triangles(18, 19, 20, 0, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x040017E0, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -220,32 +220,32 @@ Gfx d_course_skyscraper_packed_dl_580[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04001960, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(0, 3, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 2, 1, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(17, 16, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 25, 24, 0),
-    gsSP1Quadrangle(27, 26, 28, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0),
+    gsSP2Triangles(6, 7, 2, 0, 6, 2, 1, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(17, 16, 20, 0, 17, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 25, 0, 26, 25, 24, 0),
+    gsSP2Triangles(27, 26, 28, 0, 27, 28, 29, 0),
     gsSPVertex(0x04001B40, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(0, 3, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 2, 1, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0),
+    gsSP2Triangles(6, 7, 2, 0, 6, 2, 1, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04001D40, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -269,59 +269,59 @@ Gfx d_course_skyscraper_packed_dl_6C8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04001E80, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(9, 10, 11, 12, 0),
-    gsSP1Quadrangle(13, 11, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(9, 10, 11, 0, 9, 11, 12, 0),
+    gsSP2Triangles(13, 11, 14, 0, 13, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04002080, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(13, 12, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(13, 12, 14, 0, 13, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04002280, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04002480, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04002680, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(27, 26, 17, 16, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(27, 26, 17, 0, 27, 17, 16, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04002880, 14, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(7, 6, 8, 9, 0),
-    gsSP1Quadrangle(3, 2, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 1, 0, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(7, 6, 8, 0, 7, 8, 9, 0),
+    gsSP2Triangles(3, 2, 10, 0, 3, 10, 11, 0),
+    gsSP2Triangles(12, 13, 1, 0, 12, 1, 0, 0),
     gsSPEndDisplayList(),
 };
 
@@ -340,75 +340,75 @@ Gfx d_course_skyscraper_packed_dl_8D8[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04002960, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
-    gsSP1Quadrangle(4, 0, 2, 5, 0),
-    gsSP1Quadrangle(5, 6, 7, 8, 0),
+    gsSP2Triangles(4, 0, 2, 0, 4, 2, 5, 0),
+    gsSP2Triangles(5, 6, 7, 0, 5, 7, 8, 0),
     gsSP2Triangles(9, 10, 11, 0, 10, 12, 11, 0),
-    gsSP1Quadrangle(13, 11, 14, 15, 0),
-    gsSP1Quadrangle(16, 9, 11, 13, 0),
-    gsSP1Quadrangle(17, 7, 18, 19, 0),
+    gsSP2Triangles(13, 11, 14, 0, 13, 14, 15, 0),
+    gsSP2Triangles(16, 9, 11, 0, 16, 11, 13, 0),
+    gsSP2Triangles(17, 7, 18, 0, 17, 18, 19, 0),
     gsSP2Triangles(7, 20, 18, 0, 7, 21, 20, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
-    gsSP1Quadrangle(15, 14, 30, 31, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
+    gsSP2Triangles(15, 14, 30, 0, 15, 30, 31, 0),
     gsSPVertex(0x04002B60, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(7, 6, 8, 9, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(7, 6, 8, 0, 7, 8, 9, 0),
     gsSP2Triangles(6, 10, 8, 0, 6, 11, 10, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSP2Triangles(21, 24, 22, 0, 24, 25, 22, 0),
-    gsSP1Quadrangle(23, 22, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(23, 22, 26, 0, 23, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04002D60, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(9, 12, 13, 10, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(9, 12, 13, 0, 9, 13, 10, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPVertex(0x04002F40, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 4, 8, 0),
     gsSP2Triangles(7, 8, 9, 0, 4, 6, 8, 0),
     gsSP2Triangles(10, 11, 12, 0, 11, 13, 12, 0),
-    gsSP1Quadrangle(14, 10, 12, 15, 0),
+    gsSP2Triangles(14, 10, 12, 0, 14, 12, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 17, 19, 18, 0),
-    gsSP1Quadrangle(20, 16, 18, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(20, 16, 18, 0, 20, 18, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSP2Triangles(27, 30, 28, 0, 27, 31, 30, 0),
     gsSPVertex(0x04003140, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(1, 4, 2, 0, 3, 2, 5, 0),
     gsSP2Triangles(3, 5, 6, 0, 4, 7, 2, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04003340, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSP2Triangles(17, 20, 18, 0, 17, 21, 20, 0),
     gsSP2Triangles(22, 23, 24, 0, 23, 25, 24, 0),
-    gsSP1Quadrangle(26, 24, 27, 28, 0),
-    gsSP1Quadrangle(29, 22, 24, 26, 0),
+    gsSP2Triangles(26, 24, 27, 0, 26, 27, 28, 0),
+    gsSP2Triangles(29, 22, 24, 0, 29, 24, 26, 0),
     gsSPVertex(0x04003520, 22, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSP2Triangles(9, 12, 10, 0, 12, 13, 10, 0),
     gsSP2Triangles(14, 15, 16, 0, 17, 14, 18, 0),
     gsSP2Triangles(17, 18, 19, 0, 14, 16, 18, 0),
-    gsSP1Quadrangle(11, 10, 20, 21, 0),
+    gsSP2Triangles(11, 10, 20, 0, 11, 20, 21, 0),
     gsSPEndDisplayList(),
 };
 
@@ -433,16 +433,16 @@ Gfx d_course_skyscraper_packed_dl_B88[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04003680, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(2, 1, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 10, 13, 15, 0),
-    gsSP1Quadrangle(16, 12, 11, 17, 0),
-    gsSP1Quadrangle(18, 9, 8, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 21, 0),
-    gsSP1Quadrangle(27, 25, 24, 28, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(2, 1, 8, 0, 2, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 10, 13, 0, 14, 13, 15, 0),
+    gsSP2Triangles(16, 12, 11, 0, 16, 11, 17, 0),
+    gsSP2Triangles(18, 9, 8, 0, 18, 8, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 21, 0),
+    gsSP2Triangles(27, 25, 24, 0, 27, 24, 28, 0),
     gsSP1Triangle(29, 30, 31, 0),
     gsSPVertex(0x04003880, 6, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 1, 0),
@@ -470,104 +470,104 @@ Gfx d_course_skyscraper_packed_dl_C70[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040038E0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05002000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040039A0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05003000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04003A20, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05004000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04003AA0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05005000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04003B20, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05006000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04003C20, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05007000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04003D20, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05008000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04003DE0, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05009000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04003F20, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500A000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04003FE0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500B000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04004060, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500C000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040040A0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -591,19 +591,19 @@ Gfx d_course_skyscraper_packed_dl_FF8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040040E0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x040042E0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
diff --git a/courses/flower_cup/choco_mountain/packed.inc.c b/courses/flower_cup/choco_mountain/packed.inc.c
index 0c3c83ec4..04964cfd5 100644
--- a/courses/flower_cup/choco_mountain/packed.inc.c
+++ b/courses/flower_cup/choco_mountain/packed.inc.c
@@ -17,14 +17,14 @@ Gfx d_course_choco_mountain_packed_dl_0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000000, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -40,23 +40,23 @@ Gfx d_course_choco_mountain_packed_dl_98[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000200, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04000400, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -72,28 +72,28 @@ Gfx d_course_choco_mountain_packed_dl_178[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000600, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04000800, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04000A00, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -109,19 +109,19 @@ Gfx d_course_choco_mountain_packed_dl_280[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000B00, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04000D00, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -137,12 +137,12 @@ Gfx d_course_choco_mountain_packed_dl_340[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000E00, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -158,10 +158,10 @@ Gfx d_course_choco_mountain_packed_dl_3C8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000F80, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 17, 19, 18, 0),
     gsSPEndDisplayList(),
 };
@@ -189,12 +189,12 @@ Gfx d_course_choco_mountain_packed_dl_480[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040010C0, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -210,8 +210,8 @@ Gfx d_course_choco_mountain_packed_dl_508[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04001240, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -227,8 +227,8 @@ Gfx d_course_choco_mountain_packed_dl_570[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040012C0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -252,10 +252,10 @@ Gfx d_course_choco_mountain_packed_dl_5F8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04001340, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 1, 0, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(7, 6, 5, 4, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 1, 0, 3, 1, 0, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(7, 6, 5, 0, 7, 5, 4, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -275,8 +275,8 @@ Gfx d_course_choco_mountain_packed_dl_5F8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04001480, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -348,8 +348,8 @@ Gfx d_course_choco_mountain_packed_dl_838[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040016A0, 28, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 9, 11, 10, 0),
     gsSP2Triangles(11, 12, 10, 0, 13, 8, 10, 0),
     gsSP2Triangles(12, 13, 10, 0, 14, 15, 16, 0),
@@ -389,7 +389,7 @@ Gfx d_course_choco_mountain_packed_dl_8F0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040019A0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 5, 7, 6, 0),
     gsSP2Triangles(3, 2, 8, 0, 9, 10, 11, 0),
     gsSPEndDisplayList(),
@@ -416,7 +416,7 @@ Gfx d_course_choco_mountain_packed_dl_9B0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04001B40, 5, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP1Triangle(2, 4, 3, 0),
     gsSPEndDisplayList(),
 };
@@ -955,7 +955,7 @@ Gfx d_course_choco_mountain_packed_dl_17E0[] =
     gsSP2Triangles(0, 2, 15, 0, 8, 16, 17, 0),
     gsSP2Triangles(8, 17, 9, 0, 16, 8, 13, 0),
     gsSP2Triangles(11, 18, 19, 0, 11, 20, 14, 0),
-    gsSP1Quadrangle(12, 19, 16, 13, 0),
+    gsSP2Triangles(12, 19, 16, 0, 12, 16, 13, 0),
     gsSP2Triangles(21, 22, 9, 0, 17, 21, 9, 0),
     gsSP2Triangles(9, 22, 23, 0, 24, 22, 21, 0),
     gsSP2Triangles(25, 23, 22, 0, 24, 18, 22, 0),
@@ -1288,7 +1288,7 @@ Gfx d_course_choco_mountain_packed_dl_20F8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04007DD0, 18, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 5, 4, 7, 0),
     gsSP2Triangles(6, 5, 8, 0, 9, 10, 11, 0),
     gsSP2Triangles(9, 11, 12, 0, 9, 13, 10, 0),
@@ -1384,7 +1384,7 @@ Gfx d_course_choco_mountain_packed_dl_2380[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04008AF0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1709,7 +1709,7 @@ Gfx d_course_choco_mountain_packed_dl_2CA8[] =
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(1, 6, 7, 0, 8, 9, 10, 0),
     gsSP2Triangles(11, 12, 13, 0, 14, 15, 16, 0),
-    gsSP1Quadrangle(17, 18, 19, 20, 0),
+    gsSP2Triangles(17, 18, 19, 0, 17, 19, 20, 0),
     gsSP2Triangles(21, 22, 23, 0, 24, 25, 26, 0),
     gsSP1Triangle(27, 28, 29, 0),
     gsSPVertex(0x0400B830, 32, 0),
@@ -1826,7 +1826,7 @@ Gfx d_course_choco_mountain_packed_dl_2FE8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400C5E0, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(10, 11, 12, 0, 13, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 19, 20, 21, 0),
@@ -1861,7 +1861,7 @@ Gfx d_course_choco_mountain_packed_dl_30A8[] =
     gsSP2Triangles(20, 21, 22, 0, 23, 22, 24, 0),
     gsSP2Triangles(25, 26, 27, 0, 28, 29, 30, 0),
     gsSPVertex(0x0400CBB0, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(10, 11, 12, 0, 13, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 19, 20, 21, 0),
@@ -2026,7 +2026,7 @@ Gfx d_course_choco_mountain_packed_dl_34E0[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400E010, 12, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 0, 2, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 8, 11, 9, 0),
     gsSPEndDisplayList(),
 };
@@ -2356,8 +2356,8 @@ Gfx d_course_choco_mountain_packed_dl_3DD8[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040106D0, 30, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 0, 2, 0),
-    gsSP1Quadrangle(2, 1, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(2, 1, 4, 0, 2, 4, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsSP2Triangles(10, 11, 12, 0, 13, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 17, 19, 18, 0),
     gsSP2Triangles(20, 21, 22, 0, 21, 23, 22, 0),
@@ -2386,11 +2386,11 @@ Gfx d_course_choco_mountain_packed_dl_3EE8[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04010910, 28, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 5, 4, 0, 8, 9, 5, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
     gsSP2Triangles(14, 15, 16, 0, 15, 17, 16, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSP2Triangles(20, 21, 22, 0, 21, 23, 22, 0),
     gsSP2Triangles(24, 25, 26, 0, 25, 27, 26, 0),
     gsSPEndDisplayList(),
@@ -2454,9 +2454,9 @@ Gfx d_course_choco_mountain_packed_dl_4148[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x04010AD0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 1, 0, 0),
-    gsSP1Quadrangle(3, 2, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0),
+    gsSP2Triangles(3, 2, 6, 0, 3, 6, 7, 0),
     gsSP2Triangles(3, 8, 9, 0, 3, 7, 10, 0),
     gsSP2Triangles(3, 10, 8, 0, 0, 3, 9, 0),
     gsSP2Triangles(0, 9, 11, 0, 7, 12, 13, 0),
@@ -2467,15 +2467,15 @@ Gfx d_course_choco_mountain_packed_dl_4148[] =
     gsSP2Triangles(13, 17, 10, 0, 8, 18, 20, 0),
     gsSP2Triangles(8, 20, 9, 0, 9, 20, 21, 0),
     gsSP2Triangles(9, 21, 11, 0, 11, 21, 22, 0),
-    gsSP1Quadrangle(4, 0, 11, 22, 0),
-    gsSP1Quadrangle(15, 23, 24, 25, 0),
-    gsSP1Quadrangle(12, 14, 23, 15, 0),
-    gsSP1Quadrangle(25, 24, 26, 27, 0),
-    gsSP1Quadrangle(27, 26, 28, 29, 0),
-    gsSP1Quadrangle(29, 28, 30, 31, 0),
+    gsSP2Triangles(4, 0, 11, 0, 4, 11, 22, 0),
+    gsSP2Triangles(15, 23, 24, 0, 15, 24, 25, 0),
+    gsSP2Triangles(12, 14, 23, 0, 12, 23, 15, 0),
+    gsSP2Triangles(25, 24, 26, 0, 25, 26, 27, 0),
+    gsSP2Triangles(27, 26, 28, 0, 27, 28, 29, 0),
+    gsSP2Triangles(29, 28, 30, 0, 29, 30, 31, 0),
     gsSPVertex(0x04010CD0, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(3, 5, 1, 0, 0),
+    gsSP2Triangles(3, 5, 1, 0, 3, 1, 0, 0),
     gsSP2Triangles(3, 0, 6, 0, 0, 2, 7, 0),
     gsSP2Triangles(7, 2, 8, 0, 9, 10, 11, 0),
     gsSP2Triangles(9, 11, 12, 0, 13, 14, 15, 0),
@@ -2489,9 +2489,9 @@ Gfx d_course_choco_mountain_packed_dl_4148[] =
     gsSP2Triangles(7, 0, 29, 0, 31, 6, 0, 0),
     gsSP1Triangle(31, 0, 7, 0),
     gsSPVertex(0x04010ED0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 5, 4, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 5, 0, 8, 5, 4, 0),
     gsSP2Triangles(7, 10, 11, 0, 7, 6, 10, 0),
     gsSP2Triangles(12, 13, 10, 0, 11, 12, 10, 0),
     gsSP2Triangles(14, 12, 11, 0, 11, 10, 15, 0),
@@ -2511,29 +2511,29 @@ Gfx d_course_choco_mountain_packed_dl_4148[] =
     gsSP2Triangles(2, 3, 4, 0, 5, 6, 2, 0),
     gsSP2Triangles(5, 2, 4, 0, 3, 1, 7, 0),
     gsSP2Triangles(3, 7, 8, 0, 9, 8, 7, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 11, 10, 0),
-    gsSP1Quadrangle(13, 12, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 6, 5, 0),
-    gsSP1Quadrangle(20, 21, 19, 18, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 11, 0, 14, 11, 10, 0),
+    gsSP2Triangles(13, 12, 16, 0, 13, 16, 17, 0),
+    gsSP2Triangles(18, 19, 6, 0, 18, 6, 5, 0),
+    gsSP2Triangles(20, 21, 19, 0, 20, 19, 18, 0),
     gsSP2Triangles(20, 18, 22, 0, 23, 20, 22, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(27, 26, 28, 29, 0),
-    gsSP1Quadrangle(24, 27, 30, 31, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(27, 26, 28, 0, 27, 28, 29, 0),
+    gsSP2Triangles(24, 27, 30, 0, 24, 30, 31, 0),
     gsSPVertex(0x040112D0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(0, 3, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(0, 3, 8, 0, 0, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
     gsSP2Triangles(14, 15, 16, 0, 17, 15, 14, 0),
-    gsSP1Quadrangle(18, 19, 16, 14, 0),
+    gsSP2Triangles(18, 19, 16, 0, 18, 16, 14, 0),
     gsSP2Triangles(15, 20, 16, 0, 11, 10, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 22, 25, 0),
-    gsSP1Quadrangle(5, 28, 29, 6, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 22, 0, 26, 22, 25, 0),
+    gsSP2Triangles(5, 28, 29, 0, 5, 29, 6, 0),
     gsSP1Triangle(6, 30, 31, 0),
     gsSPVertex(0x040114D0, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(3, 4, 5, 0, 6, 7, 8, 0),
     gsSP2Triangles(6, 8, 9, 0, 10, 11, 12, 0),
     gsSP2Triangles(10, 12, 13, 0, 14, 15, 10, 0),
@@ -2549,43 +2549,43 @@ Gfx d_course_choco_mountain_packed_dl_4148[] =
     gsSP1Triangle(17, 29, 30, 0),
     gsSPVertex(0x040116C0, 30, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
-    gsSP1Quadrangle(2, 1, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 0, 0),
-    gsSP1Quadrangle(9, 6, 0, 2, 0),
-    gsSP1Quadrangle(7, 10, 11, 8, 0),
-    gsSP1Quadrangle(12, 13, 14, 9, 0),
-    gsSP1Quadrangle(9, 14, 15, 6, 0),
-    gsSP1Quadrangle(7, 16, 17, 10, 0),
-    gsSP1Quadrangle(6, 15, 16, 7, 0),
-    gsSP1Quadrangle(17, 18, 19, 10, 0),
+    gsSP2Triangles(2, 1, 4, 0, 2, 4, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 0, 0),
+    gsSP2Triangles(9, 6, 0, 0, 9, 0, 2, 0),
+    gsSP2Triangles(7, 10, 11, 0, 7, 11, 8, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 9, 0),
+    gsSP2Triangles(9, 14, 15, 0, 9, 15, 6, 0),
+    gsSP2Triangles(7, 16, 17, 0, 7, 17, 10, 0),
+    gsSP2Triangles(6, 15, 16, 0, 6, 16, 7, 0),
+    gsSP2Triangles(17, 18, 19, 0, 17, 19, 10, 0),
     gsSP2Triangles(20, 21, 22, 0, 22, 21, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(26, 28, 29, 27, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(26, 28, 29, 0, 26, 29, 27, 0),
     gsSPVertex(0x040118A0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(7, 6, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 2, 0),
-    gsSP1Quadrangle(2, 12, 13, 3, 0),
-    gsSP1Quadrangle(1, 14, 10, 2, 0),
-    gsSP1Quadrangle(14, 15, 16, 10, 0),
-    gsSP1Quadrangle(17, 18, 9, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 21, 20, 0),
-    gsSP1Quadrangle(23, 22, 26, 27, 0),
-    gsSP1Quadrangle(20, 23, 28, 29, 0),
-    gsSP1Quadrangle(24, 20, 29, 30, 0),
-    gsSP1Quadrangle(23, 27, 31, 28, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(7, 6, 8, 0, 7, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 2, 0),
+    gsSP2Triangles(2, 12, 13, 0, 2, 13, 3, 0),
+    gsSP2Triangles(1, 14, 10, 0, 1, 10, 2, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 10, 0),
+    gsSP2Triangles(17, 18, 9, 0, 17, 9, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 21, 0, 24, 21, 20, 0),
+    gsSP2Triangles(23, 22, 26, 0, 23, 26, 27, 0),
+    gsSP2Triangles(20, 23, 28, 0, 20, 28, 29, 0),
+    gsSP2Triangles(24, 20, 29, 0, 24, 29, 30, 0),
+    gsSP2Triangles(23, 27, 31, 0, 23, 31, 28, 0),
     gsSPVertex(0x04011AA0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 5, 7, 6, 0),
-    gsSP1Quadrangle(8, 9, 5, 4, 0),
-    gsSP1Quadrangle(10, 11, 9, 8, 0),
-    gsSP1Quadrangle(8, 4, 12, 13, 0),
-    gsSP1Quadrangle(10, 8, 13, 14, 0),
-    gsSP1Quadrangle(4, 6, 15, 12, 0),
-    gsSP1Quadrangle(16, 17, 11, 10, 0),
-    gsSP1Quadrangle(16, 10, 14, 18, 0),
+    gsSP2Triangles(8, 9, 5, 0, 8, 5, 4, 0),
+    gsSP2Triangles(10, 11, 9, 0, 10, 9, 8, 0),
+    gsSP2Triangles(8, 4, 12, 0, 8, 12, 13, 0),
+    gsSP2Triangles(10, 8, 13, 0, 10, 13, 14, 0),
+    gsSP2Triangles(4, 6, 15, 0, 4, 15, 12, 0),
+    gsSP2Triangles(16, 17, 11, 0, 16, 11, 10, 0),
+    gsSP2Triangles(16, 10, 14, 0, 16, 14, 18, 0),
     gsSP2Triangles(6, 19, 15, 0, 20, 21, 22, 0),
     gsSP2Triangles(20, 22, 23, 0, 24, 25, 21, 0),
     gsSP2Triangles(24, 21, 20, 0, 23, 22, 26, 0),
@@ -2594,7 +2594,7 @@ Gfx d_course_choco_mountain_packed_dl_4148[] =
     gsSP2Triangles(28, 24, 29, 0, 30, 31, 28, 0),
     gsSP1Triangle(30, 28, 29, 0),
     gsSPVertex(0x04011CA0, 19, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 3, 7, 8, 0),
     gsSP2Triangles(3, 8, 9, 0, 0, 3, 9, 0),
     gsSP2Triangles(0, 9, 10, 0, 7, 11, 12, 0),
@@ -2659,15 +2659,15 @@ Gfx d_course_choco_mountain_packed_dl_46F0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04011F90, 27, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(1, 4, 2, 0, 5, 3, 6, 0),
     gsSP2Triangles(1, 7, 4, 0, 8, 9, 10, 0),
     gsSP2Triangles(8, 10, 11, 0, 12, 8, 11, 0),
     gsSP2Triangles(12, 11, 13, 0, 14, 12, 13, 0),
     gsSP2Triangles(14, 13, 15, 0, 16, 17, 18, 0),
-    gsSP1Quadrangle(19, 20, 21, 22, 0),
-    gsSP1Quadrangle(23, 19, 22, 24, 0),
-    gsSP1Quadrangle(25, 23, 24, 26, 0),
+    gsSP2Triangles(19, 20, 21, 0, 19, 21, 22, 0),
+    gsSP2Triangles(23, 19, 22, 0, 23, 22, 24, 0),
+    gsSP2Triangles(25, 23, 24, 0, 25, 24, 26, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2683,13 +2683,13 @@ Gfx d_course_choco_mountain_packed_dl_4790[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04012140, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 4, 7, 5, 0),
     gsSP2Triangles(7, 8, 5, 0, 7, 9, 8, 0),
     gsSP2Triangles(9, 10, 8, 0, 9, 11, 10, 0),
     gsSP2Triangles(12, 13, 14, 0, 12, 15, 13, 0),
-    gsSP1Quadrangle(16, 12, 14, 17, 0),
-    gsSP1Quadrangle(18, 16, 17, 19, 0),
+    gsSP2Triangles(16, 12, 14, 0, 16, 14, 17, 0),
+    gsSP2Triangles(18, 16, 17, 0, 18, 17, 19, 0),
     gsSP2Triangles(20, 21, 22, 0, 23, 20, 24, 0),
     gsSP2Triangles(20, 22, 24, 0, 23, 24, 25, 0),
     gsSP2Triangles(26, 3, 27, 0, 26, 0, 3, 0),
@@ -2709,12 +2709,12 @@ Gfx d_course_choco_mountain_packed_dl_4840[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04012320, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 4, 7, 5, 0),
     gsSP2Triangles(8, 4, 6, 0, 7, 9, 5, 0),
     gsSP2Triangles(8, 6, 10, 0, 7, 11, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(13, 16, 17, 14, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(13, 16, 17, 0, 13, 17, 14, 0),
     gsSP2Triangles(18, 19, 20, 0, 18, 21, 19, 0),
     gsSP2Triangles(22, 23, 24, 0, 25, 22, 24, 0),
     gsSP2Triangles(22, 26, 23, 0, 25, 24, 27, 0),
@@ -2734,12 +2734,12 @@ Gfx d_course_choco_mountain_packed_dl_48E8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04012520, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 4, 8, 0),
     gsSP2Triangles(4, 6, 8, 0, 7, 8, 9, 0),
     gsSP2Triangles(10, 11, 12, 0, 10, 13, 11, 0),
     gsSP2Triangles(14, 15, 16, 0, 14, 17, 15, 0),
-    gsSP1Quadrangle(18, 14, 16, 19, 0),
+    gsSP2Triangles(18, 14, 16, 0, 18, 16, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2787,7 +2787,7 @@ Gfx d_course_choco_mountain_packed_dl_49F0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04012920, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2809,7 +2809,7 @@ Gfx d_course_choco_mountain_packed_dl_4AB0[] =
     gsSP2Triangles(18, 19, 20, 0, 21, 22, 23, 0),
     gsSP2Triangles(24, 25, 26, 0, 27, 28, 29, 0),
     gsSPVertex(0x04012B40, 22, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(10, 11, 12, 0, 13, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 19, 20, 21, 0),
@@ -2979,7 +2979,7 @@ Gfx d_course_choco_mountain_packed_dl_4F30[] =
     gsSP2Triangles(4, 5, 6, 0, 5, 7, 6, 0),
     gsSP2Triangles(8, 9, 10, 0, 9, 11, 10, 0),
     gsSP2Triangles(12, 13, 14, 0, 13, 15, 14, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSP2Triangles(20, 21, 22, 0, 20, 23, 21, 0),
     gsSP2Triangles(24, 25, 26, 0, 25, 27, 26, 0),
     gsSPEndDisplayList(),
@@ -2997,13 +2997,13 @@ Gfx d_course_choco_mountain_packed_dl_4FC0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04013F00, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 5, 7, 6, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 16, 19, 17, 0),
     gsSP2Triangles(20, 21, 22, 0, 20, 23, 21, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSP2Triangles(28, 29, 30, 0, 29, 31, 30, 0),
     gsSPVertex(0x04014100, 8, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 0, 2, 0),
@@ -3025,7 +3025,7 @@ Gfx d_course_choco_mountain_packed_dl_5070[] =
     gsSPVertex(0x04014180, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
     gsSP2Triangles(14, 15, 16, 0, 17, 18, 19, 0),
     gsSP2Triangles(17, 19, 20, 0, 21, 22, 23, 0),
     gsSP2Triangles(21, 23, 24, 0, 25, 26, 27, 0),
@@ -3212,12 +3212,12 @@ Gfx d_course_choco_mountain_packed_dl_5558[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040152D0, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 6, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x007C),
@@ -3227,18 +3227,18 @@ Gfx d_course_choco_mountain_packed_dl_5558[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04015450, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05006000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04015510, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3254,8 +3254,8 @@ Gfx d_course_choco_mountain_packed_dl_5688[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040155D0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 6, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x007C),
@@ -3265,14 +3265,14 @@ Gfx d_course_choco_mountain_packed_dl_5688[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04015650, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05008000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04015690, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3288,8 +3288,8 @@ Gfx d_course_choco_mountain_packed_dl_5778[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040156D0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 6, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x007C),
@@ -3299,14 +3299,14 @@ Gfx d_course_choco_mountain_packed_dl_5778[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04015750, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500D000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04015790, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3335,7 +3335,7 @@ Gfx d_course_choco_mountain_packed_dl_5888[] =
     gsSP2Triangles(6, 8, 7, 0, 9, 8, 6, 0),
     gsSP2Triangles(9, 10, 8, 0, 11, 12, 13, 0),
     gsSP2Triangles(13, 14, 11, 0, 15, 16, 17, 0),
-    gsSP1Quadrangle(16, 18, 19, 17, 0),
+    gsSP2Triangles(16, 18, 19, 0, 16, 19, 17, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3373,7 +3373,7 @@ Gfx d_course_choco_mountain_packed_dl_59A0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04015A80, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3389,9 +3389,9 @@ Gfx d_course_choco_mountain_packed_dl_5A00[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04015AC0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
diff --git a/courses/flower_cup/frappe_snowland/course_data.inc.c b/courses/flower_cup/frappe_snowland/course_data.inc.c
index f88c57f3f..91c918173 100644
--- a/courses/flower_cup/frappe_snowland/course_data.inc.c
+++ b/courses/flower_cup/frappe_snowland/course_data.inc.c
@@ -2743,9 +2743,9 @@ Gfx d_course_frappe_snowland_dl_tree[] =
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x00FC),
     gsDPLoadTextureBlock(0x03009000, G_IM_FMT_CI, G_IM_SIZ_8b, 32, 64, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD),
     gsSPVertex(d_frappe_snowland_tree, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPLoadTextureBlock(0x03009800, G_IM_FMT_CI, G_IM_SIZ_8b, 32, 64, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPEndDisplayList(),
 };
diff --git a/courses/flower_cup/frappe_snowland/packed.inc.c b/courses/flower_cup/frappe_snowland/packed.inc.c
index d7114702d..86aae43d4 100644
--- a/courses/flower_cup/frappe_snowland/packed.inc.c
+++ b/courses/flower_cup/frappe_snowland/packed.inc.c
@@ -20,7 +20,7 @@ Gfx d_course_frappe_snowland_packed_dl_0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000000, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
     gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
     gsSPEndDisplayList(),
@@ -222,11 +222,11 @@ Gfx d_course_frappe_snowland_packed_dl_548[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04001C50, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(10, 11, 12, 0, 13, 14, 15, 0),
     gsSP2Triangles(13, 16, 17, 0, 18, 19, 20, 0),
-    gsSP1Quadrangle(21, 22, 23, 24, 0),
+    gsSP2Triangles(21, 22, 23, 0, 21, 23, 24, 0),
     gsSP2Triangles(25, 26, 27, 0, 28, 29, 30, 0),
     gsSPVertex(0x04001E40, 30, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
@@ -255,7 +255,7 @@ Gfx d_course_frappe_snowland_packed_dl_548[] =
     gsSP2Triangles(22, 24, 23, 0, 25, 26, 27, 0),
     gsSP1Triangle(28, 29, 25, 0),
     gsSPVertex(0x040025C0, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(7, 10, 11, 0, 12, 13, 14, 0),
     gsSP2Triangles(15, 16, 17, 0, 18, 19, 20, 0),
@@ -375,7 +375,7 @@ Gfx d_course_frappe_snowland_packed_dl_960[] =
     gsSPVertex(0x04003430, 16, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 4, 6, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 13, 12, 15, 0),
     gsSPEndDisplayList(),
 };
@@ -411,7 +411,7 @@ Gfx d_course_frappe_snowland_packed_dl_A48[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04003610, 8, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 2, 1, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -428,7 +428,7 @@ Gfx d_course_frappe_snowland_packed_dl_AB0[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04003690, 20, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 11, 12, 13, 0),
     gsSP2Triangles(14, 11, 15, 0, 11, 14, 12, 0),
     gsSP2Triangles(16, 17, 18, 0, 19, 16, 18, 0),
@@ -510,7 +510,7 @@ Gfx d_course_frappe_snowland_packed_dl_CC0[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04003A50, 8, 0),
     gsSP2Triangles(0, 1, 2, 0, 2, 3, 0, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -545,7 +545,7 @@ Gfx d_course_frappe_snowland_packed_dl_DA0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04003BD0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 5, 4, 0),
     gsSP2Triangles(8, 9, 10, 0, 10, 9, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 14, 13, 15, 0),
@@ -564,7 +564,7 @@ Gfx d_course_frappe_snowland_packed_dl_E18[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04003CD0, 19, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 4, 6, 0),
     gsSP2Triangles(8, 9, 10, 0, 11, 12, 13, 0),
     gsSP2Triangles(11, 14, 12, 0, 15, 16, 17, 0),
@@ -661,7 +661,7 @@ Gfx d_course_frappe_snowland_packed_dl_1080[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040040C0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -677,7 +677,7 @@ Gfx d_course_frappe_snowland_packed_dl_10E0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04004100, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 4, 7, 5, 0),
     gsSP2Triangles(8, 9, 10, 0, 9, 11, 10, 0),
     gsSPEndDisplayList(),
@@ -803,7 +803,7 @@ Gfx d_course_frappe_snowland_packed_dl_13F0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04004460, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(0, 3, 4, 0, 1, 5, 2, 0),
     gsSPEndDisplayList(),
 };
@@ -856,7 +856,7 @@ Gfx d_course_frappe_snowland_packed_dl_1538[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040045C0, 11, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(1, 4, 2, 0, 1, 5, 6, 0),
     gsSP2Triangles(1, 6, 4, 0, 7, 8, 9, 0),
     gsSP1Triangle(9, 10, 7, 0),
@@ -894,7 +894,7 @@ Gfx d_course_frappe_snowland_packed_dl_1628[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04004720, 7, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(1, 4, 2, 0, 5, 4, 1, 0),
     gsSP1Triangle(5, 1, 6, 0),
     gsSPEndDisplayList(),
@@ -959,7 +959,7 @@ Gfx d_course_frappe_snowland_packed_dl_1748[] =
     gsSP2Triangles(25, 26, 22, 0, 22, 27, 24, 0),
     gsSP2Triangles(27, 22, 21, 0, 20, 28, 21, 0),
     gsSP2Triangles(27, 21, 28, 0, 29, 25, 24, 0),
-    gsSP1Quadrangle(29, 24, 27, 28, 0),
+    gsSP2Triangles(29, 24, 27, 0, 29, 27, 28, 0),
     gsSP2Triangles(30, 25, 31, 0, 31, 25, 29, 0),
     gsSPVertex(0x04004A10, 9, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 0, 2, 0),
@@ -1010,7 +1010,7 @@ Gfx d_course_frappe_snowland_packed_dl_1910[] =
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
     gsSP2Triangles(0, 4, 3, 0, 3, 4, 5, 0),
     gsSP2Triangles(5, 4, 6, 0, 6, 4, 7, 0),
-    gsSP1Quadrangle(3, 8, 9, 1, 0),
+    gsSP2Triangles(3, 8, 9, 0, 3, 9, 1, 0),
     gsSP2Triangles(3, 5, 10, 0, 10, 8, 3, 0),
     gsSP2Triangles(10, 5, 11, 0, 11, 5, 6, 0),
     gsSP2Triangles(6, 7, 12, 0, 13, 6, 12, 0),
@@ -1018,9 +1018,9 @@ Gfx d_course_frappe_snowland_packed_dl_1910[] =
     gsSP2Triangles(15, 13, 12, 0, 16, 9, 8, 0),
     gsSP2Triangles(17, 18, 19, 0, 17, 20, 18, 0),
     gsSP2Triangles(21, 18, 22, 0, 21, 19, 18, 0),
-    gsSP1Quadrangle(18, 20, 23, 22, 0),
+    gsSP2Triangles(18, 20, 23, 0, 18, 23, 22, 0),
     gsSP2Triangles(19, 21, 24, 0, 23, 20, 25, 0),
-    gsSP1Quadrangle(9, 16, 26, 27, 0),
+    gsSP2Triangles(9, 16, 26, 0, 9, 26, 27, 0),
     gsSP2Triangles(1, 9, 27, 0, 28, 27, 29, 0),
     gsSP2Triangles(1, 27, 28, 0, 27, 26, 30, 0),
     gsSP2Triangles(27, 30, 29, 0, 1, 28, 2, 0),
@@ -1045,7 +1045,7 @@ Gfx d_course_frappe_snowland_packed_dl_1A08[] =
     gsSP2Triangles(0, 1, 2, 0, 2, 1, 3, 0),
     gsSP2Triangles(1, 4, 3, 0, 0, 4, 1, 0),
     gsSP2Triangles(5, 4, 0, 0, 2, 3, 6, 0),
-    gsSP1Quadrangle(7, 8, 9, 10, 0),
+    gsSP2Triangles(7, 8, 9, 0, 7, 9, 10, 0),
     gsSP2Triangles(7, 10, 11, 0, 9, 8, 12, 0),
     gsSP2Triangles(9, 12, 13, 0, 10, 9, 13, 0),
     gsSP2Triangles(10, 14, 11, 0, 10, 13, 14, 0),
@@ -1063,7 +1063,7 @@ Gfx d_course_frappe_snowland_packed_dl_1A08[] =
     gsSPVertex(0x04005020, 15, 0),
     gsSP2Triangles(0, 1, 2, 0, 2, 3, 0, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 4, 6, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSP2Triangles(12, 11, 10, 0, 11, 13, 14, 0),
     gsSP1Triangle(11, 12, 13, 0),
     gsSPEndDisplayList(),
@@ -1087,7 +1087,7 @@ Gfx d_course_frappe_snowland_packed_dl_1B20[] =
     gsSP2Triangles(7, 8, 2, 0, 8, 6, 2, 0),
     gsSP2Triangles(9, 3, 5, 0, 6, 10, 5, 0),
     gsSP2Triangles(11, 12, 13, 0, 11, 8, 7, 0),
-    gsSP1Quadrangle(12, 11, 7, 14, 0),
+    gsSP2Triangles(12, 11, 7, 0, 12, 7, 14, 0),
     gsSP2Triangles(14, 7, 4, 0, 15, 13, 12, 0),
     gsSP2Triangles(16, 17, 18, 0, 16, 19, 17, 0),
     gsSP2Triangles(19, 20, 21, 0, 21, 17, 19, 0),
@@ -1116,7 +1116,7 @@ Gfx d_course_frappe_snowland_packed_dl_1BE8[] =
     gsSP2Triangles(2, 5, 7, 0, 0, 6, 8, 0),
     gsSP2Triangles(9, 0, 8, 0, 3, 0, 9, 0),
     gsSP2Triangles(7, 10, 6, 0, 10, 8, 6, 0),
-    gsSP1Quadrangle(11, 12, 13, 14, 0),
+    gsSP2Triangles(11, 12, 13, 0, 11, 13, 14, 0),
     gsSP2Triangles(15, 16, 17, 0, 18, 19, 16, 0),
     gsSP2Triangles(17, 16, 19, 0, 16, 15, 20, 0),
     gsSP2Triangles(16, 20, 18, 0, 18, 20, 21, 0),
@@ -1144,7 +1144,7 @@ Gfx d_course_frappe_snowland_packed_dl_1C98[] =
     gsSP2Triangles(10, 13, 14, 0, 13, 10, 15, 0),
     gsSP2Triangles(15, 10, 16, 0, 10, 14, 11, 0),
     gsSP2Triangles(14, 17, 11, 0, 12, 11, 18, 0),
-    gsSP1Quadrangle(18, 11, 17, 19, 0),
+    gsSP2Triangles(18, 11, 17, 0, 18, 17, 19, 0),
     gsSP2Triangles(20, 19, 17, 0, 8, 21, 6, 0),
     gsSP2Triangles(21, 7, 6, 0, 12, 18, 22, 0),
     gsSP2Triangles(22, 18, 19, 0, 23, 16, 24, 0),
@@ -1245,7 +1245,7 @@ Gfx d_course_frappe_snowland_packed_dl_1F10[] =
     gsSP2Triangles(20, 18, 28, 0, 28, 18, 31, 0),
     gsSP1Triangle(20, 29, 21, 0),
     gsSPVertex(0x04005B90, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 3, 2, 0, 2, 5, 4, 0),
     gsSP2Triangles(2, 1, 5, 0, 4, 5, 6, 0),
     gsSP1Triangle(6, 5, 7, 0),
@@ -1318,7 +1318,7 @@ Gfx d_course_frappe_snowland_packed_dl_2160[] =
     gsSP2Triangles(6, 0, 2, 0, 6, 5, 0, 0),
     gsSP2Triangles(3, 4, 7, 0, 4, 8, 7, 0),
     gsSP2Triangles(4, 5, 8, 0, 1, 3, 9, 0),
-    gsSP1Quadrangle(3, 7, 10, 9, 0),
+    gsSP2Triangles(3, 7, 10, 0, 3, 10, 9, 0),
     gsSP2Triangles(11, 12, 13, 0, 11, 14, 12, 0),
     gsSP2Triangles(15, 14, 16, 0, 15, 17, 14, 0),
     gsSP2Triangles(14, 17, 12, 0, 17, 18, 12, 0),
@@ -1397,7 +1397,7 @@ Gfx d_course_frappe_snowland_packed_dl_2350[] =
     gsSP2Triangles(10, 16, 17, 0, 19, 14, 10, 0),
     gsSP2Triangles(10, 12, 19, 0, 18, 13, 10, 0),
     gsSP2Triangles(9, 20, 7, 0, 7, 21, 6, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
     gsSP2Triangles(24, 26, 25, 0, 17, 27, 18, 0),
     gsSP2Triangles(21, 28, 6, 0, 6, 29, 5, 0),
     gsSP1Triangle(28, 29, 6, 0),
@@ -1416,10 +1416,10 @@ Gfx d_course_frappe_snowland_packed_dl_2418[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04006360, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(0, 4, 5, 0, 5, 1, 0, 0),
     gsSP2Triangles(2, 6, 7, 0, 7, 6, 8, 0),
-    gsSP1Quadrangle(6, 9, 10, 11, 0),
+    gsSP2Triangles(6, 9, 10, 0, 6, 10, 11, 0),
     gsSP2Triangles(6, 11, 8, 0, 2, 9, 6, 0),
     gsSP2Triangles(3, 2, 7, 0, 2, 1, 9, 0),
     gsSPEndDisplayList(),
@@ -1558,10 +1558,10 @@ Gfx d_course_frappe_snowland_packed_dl_27A8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04006750, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(0, 3, 4, 0, 5, 6, 3, 0),
     gsSP2Triangles(3, 6, 4, 0, 7, 8, 9, 0),
-    gsSP1Quadrangle(5, 7, 9, 6, 0),
+    gsSP2Triangles(5, 7, 9, 0, 5, 9, 6, 0),
     gsSP2Triangles(10, 11, 12, 0, 11, 13, 12, 0),
     gsSP2Triangles(11, 14, 13, 0, 14, 15, 13, 0),
     gsSP2Triangles(14, 16, 15, 0, 10, 17, 18, 0),
@@ -1581,8 +1581,8 @@ Gfx d_course_frappe_snowland_packed_dl_2840[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04006890, 17, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(0, 3, 4, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0),
     gsSP2Triangles(6, 7, 2, 0, 1, 6, 2, 0),
     gsSP2Triangles(8, 9, 10, 0, 9, 11, 10, 0),
     gsSP2Triangles(9, 12, 11, 0, 13, 14, 15, 0),
@@ -1603,8 +1603,8 @@ Gfx d_course_frappe_snowland_packed_dl_28D0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040069A0, 19, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 0, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 0, 0),
     gsSP2Triangles(5, 7, 6, 0, 6, 1, 0, 0),
     gsSP2Triangles(8, 9, 10, 0, 11, 12, 13, 0),
     gsSP2Triangles(14, 12, 11, 0, 11, 13, 15, 0),
@@ -1625,9 +1625,9 @@ Gfx d_course_frappe_snowland_packed_dl_2960[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04006AD0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 2, 1, 5, 0),
-    gsSP1Quadrangle(5, 1, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 2, 1, 0, 4, 1, 5, 0),
+    gsSP2Triangles(5, 1, 6, 0, 5, 6, 7, 0),
     gsSP2Triangles(6, 8, 7, 0, 9, 10, 11, 0),
     gsSP2Triangles(10, 12, 11, 0, 10, 13, 12, 0),
     gsSP2Triangles(13, 14, 12, 0, 13, 15, 14, 0),
@@ -1649,12 +1649,12 @@ Gfx d_course_frappe_snowland_packed_dl_29E8[] =
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
     gsSP2Triangles(4, 0, 2, 0, 3, 5, 1, 0),
     gsSP2Triangles(4, 2, 6, 0, 3, 7, 5, 0),
-    gsSP1Quadrangle(7, 8, 9, 5, 0),
+    gsSP2Triangles(7, 8, 9, 0, 7, 9, 5, 0),
     gsSP2Triangles(8, 10, 9, 0, 10, 11, 12, 0),
     gsSP2Triangles(10, 12, 9, 0, 13, 14, 15, 0),
-    gsSP1Quadrangle(13, 15, 16, 17, 0),
+    gsSP2Triangles(13, 15, 16, 0, 13, 16, 17, 0),
     gsSP2Triangles(16, 18, 17, 0, 19, 20, 21, 0),
-    gsSP1Quadrangle(20, 22, 23, 21, 0),
+    gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0),
     gsSP1Triangle(22, 24, 23, 0),
     gsSPEndDisplayList(),
 };
@@ -1684,7 +1684,7 @@ Gfx d_course_frappe_snowland_packed_dl_2AD0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04006D60, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1722,7 +1722,7 @@ Gfx d_course_frappe_snowland_packed_dl_2B48[] =
     gsSP2Triangles(6, 7, 8, 0, 9, 10, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 15, 16, 17, 0),
     gsSP2Triangles(15, 17, 18, 0, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
     gsSP2Triangles(26, 27, 28, 0, 29, 30, 12, 0),
     gsSPVertex(0x04007350, 30, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
@@ -1820,14 +1820,14 @@ Gfx d_course_frappe_snowland_packed_dl_2B48[] =
     gsSP1Triangle(29, 30, 31, 0),
     gsSPVertex(0x04008E60, 30, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsSP2Triangles(9, 10, 11, 0, 12, 13, 14, 0),
     gsSP2Triangles(15, 16, 17, 0, 18, 19, 20, 0),
     gsSP2Triangles(21, 22, 23, 0, 24, 25, 26, 0),
     gsSP1Triangle(27, 28, 29, 0),
     gsSPVertex(0x04009040, 31, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsSP2Triangles(10, 11, 12, 0, 13, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 19, 20, 21, 0),
     gsSP2Triangles(22, 23, 24, 0, 25, 26, 27, 0),
@@ -1878,7 +1878,7 @@ Gfx d_course_frappe_snowland_packed_dl_2B48[] =
     gsSP1Triangle(28, 29, 30, 0),
     gsSPVertex(0x04009F80, 22, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsSP2Triangles(10, 11, 12, 0, 13, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 19, 20, 21, 0),
     gsSPEndDisplayList(),
@@ -1905,19 +1905,19 @@ Gfx d_course_frappe_snowland_packed_dl_3128[] =
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(3, 5, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(10, 11, 12, 0, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(19, 20, 21, 22, 0),
-    gsSP1Quadrangle(23, 24, 25, 26, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(19, 20, 21, 0, 19, 21, 22, 0),
+    gsSP2Triangles(23, 24, 25, 0, 23, 25, 26, 0),
     gsSP2Triangles(27, 28, 29, 0, 29, 30, 27, 0),
     gsSPVertex(0x0400A2D0, 31, 0),
     gsSP2Triangles(0, 1, 2, 0, 2, 3, 4, 0),
     gsSP2Triangles(5, 6, 7, 0, 8, 9, 10, 0),
     gsSP2Triangles(11, 12, 13, 0, 14, 15, 16, 0),
     gsSP2Triangles(17, 18, 19, 0, 20, 21, 22, 0),
-    gsSP1Quadrangle(23, 24, 25, 26, 0),
-    gsSP1Quadrangle(27, 28, 29, 30, 0),
+    gsSP2Triangles(23, 24, 25, 0, 23, 25, 26, 0),
+    gsSP2Triangles(27, 28, 29, 0, 27, 29, 30, 0),
     gsSPVertex(0x0400A4C0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 6, 7, 8, 0),
     gsSP2Triangles(9, 10, 11, 0, 11, 10, 12, 0),
     gsSP2Triangles(13, 14, 15, 0, 16, 17, 18, 0),
@@ -1941,7 +1941,7 @@ Gfx d_course_frappe_snowland_packed_dl_3128[] =
     gsSP2Triangles(23, 25, 26, 0, 27, 28, 29, 0),
     gsSP1Triangle(27, 29, 30, 0),
     gsSPVertex(0x0400AA90, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(10, 11, 12, 0, 13, 14, 15, 0),
     gsSP2Triangles(13, 15, 16, 0, 17, 18, 19, 0),
@@ -1952,7 +1952,7 @@ Gfx d_course_frappe_snowland_packed_dl_3128[] =
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(3, 6, 7, 0, 8, 9, 10, 0),
     gsSP2Triangles(11, 12, 13, 0, 11, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSP2Triangles(20, 21, 22, 0, 23, 24, 25, 0),
     gsSP2Triangles(26, 27, 28, 0, 29, 30, 31, 0),
     gsSPVertex(0x0400AE80, 24, 0),
@@ -1977,20 +1977,20 @@ Gfx d_course_frappe_snowland_packed_dl_3358[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400B000, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsSP2Triangles(10, 11, 12, 0, 13, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 19, 20, 21, 0),
     gsSP2Triangles(22, 23, 21, 0, 24, 25, 26, 0),
     gsSP2Triangles(24, 26, 27, 0, 28, 29, 30, 0),
     gsSP1Triangle(28, 30, 31, 0),
     gsSPVertex(0x0400B200, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(23, 22, 24, 25, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(23, 22, 24, 0, 23, 24, 25, 0),
     gsSP2Triangles(26, 27, 28, 0, 29, 30, 31, 0),
     gsSPVertex(0x0400B400, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 1, 4, 0),
@@ -2001,8 +2001,8 @@ Gfx d_course_frappe_snowland_packed_dl_3358[] =
     gsSP1Triangle(29, 30, 31, 0),
     gsSPVertex(0x0400B600, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
     gsSP2Triangles(14, 15, 16, 0, 17, 18, 19, 0),
     gsSP2Triangles(17, 19, 20, 0, 21, 22, 18, 0),
     gsSP2Triangles(21, 18, 17, 0, 23, 24, 25, 0),
@@ -2011,12 +2011,12 @@ Gfx d_course_frappe_snowland_packed_dl_3358[] =
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(6, 7, 8, 0, 0, 8, 9, 0),
     gsSP2Triangles(0, 10, 11, 0, 12, 13, 14, 0),
-    gsSP1Quadrangle(15, 16, 17, 18, 0),
-    gsSP1Quadrangle(19, 20, 21, 22, 0),
-    gsSP1Quadrangle(23, 24, 25, 26, 0),
-    gsSP1Quadrangle(27, 28, 29, 30, 0),
+    gsSP2Triangles(15, 16, 17, 0, 15, 17, 18, 0),
+    gsSP2Triangles(19, 20, 21, 0, 19, 21, 22, 0),
+    gsSP2Triangles(23, 24, 25, 0, 23, 25, 26, 0),
+    gsSP2Triangles(27, 28, 29, 0, 27, 29, 30, 0),
     gsSPVertex(0x0400B9F0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(7, 9, 10, 0, 11, 12, 13, 0),
     gsSP2Triangles(11, 13, 14, 0, 15, 16, 17, 0),
@@ -2024,17 +2024,17 @@ Gfx d_course_frappe_snowland_packed_dl_3358[] =
     gsSP2Triangles(24, 25, 26, 0, 27, 25, 28, 0),
     gsSP1Triangle(29, 30, 31, 0),
     gsSPVertex(0x0400BBF0, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(10, 11, 12, 0, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSP2Triangles(24, 25, 26, 0, 27, 28, 29, 0),
     gsSPVertex(0x0400BDD0, 31, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(3, 5, 6, 7, 0),
+    gsSP2Triangles(3, 5, 6, 0, 3, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
     gsSP2Triangles(14, 17, 18, 0, 19, 20, 21, 0),
     gsSP2Triangles(22, 23, 24, 0, 25, 26, 27, 0),
     gsSP2Triangles(25, 27, 28, 0, 28, 27, 29, 0),
@@ -2055,27 +2055,27 @@ Gfx d_course_frappe_snowland_packed_dl_35A8[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400BFC0, 30, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsSP2Triangles(10, 11, 7, 0, 12, 11, 13, 0),
     gsSP2Triangles(14, 15, 16, 0, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 26, 25, 29, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 26, 25, 0, 28, 25, 29, 0),
     gsSPVertex(0x0400C1A0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsSP2Triangles(10, 11, 12, 0, 13, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 19, 20, 21, 0),
     gsSP2Triangles(19, 21, 22, 0, 23, 24, 25, 0),
     gsSP2Triangles(25, 26, 23, 0, 27, 28, 29, 0),
     gsSP1Triangle(29, 30, 31, 0),
     gsSPVertex(0x0400C3A0, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(13, 12, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(13, 12, 14, 0, 13, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 19, 20, 21, 0),
     gsSP2Triangles(22, 23, 24, 0, 25, 26, 27, 0),
     gsSP1Triangle(28, 29, 30, 0),
@@ -2083,15 +2083,15 @@ Gfx d_course_frappe_snowland_packed_dl_35A8[] =
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(3, 5, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(10, 11, 12, 0, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSP2Triangles(20, 21, 22, 0, 23, 24, 25, 0),
     gsSP2Triangles(23, 25, 26, 0, 27, 28, 29, 0),
     gsSP1Triangle(27, 29, 30, 0),
     gsSPVertex(0x0400C780, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
     gsSP2Triangles(18, 19, 20, 0, 21, 22, 23, 0),
     gsSP2Triangles(24, 25, 26, 0, 27, 28, 29, 0),
     gsSPVertex(0x0400C960, 9, 0),
@@ -2112,7 +2112,7 @@ Gfx d_course_frappe_snowland_packed_dl_3758[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400C9F0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 5, 8, 0),
     gsSP2Triangles(9, 10, 5, 0, 5, 10, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 14, 15, 16, 0),
@@ -2133,28 +2133,28 @@ Gfx d_course_frappe_snowland_packed_dl_3758[] =
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(6, 7, 8, 0, 8, 7, 9, 0),
     gsSP2Triangles(10, 11, 12, 0, 12, 11, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(17, 18, 19, 14, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(23, 22, 24, 25, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(17, 18, 19, 0, 17, 19, 14, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(23, 22, 24, 0, 23, 24, 25, 0),
     gsSP2Triangles(26, 27, 28, 0, 28, 29, 30, 0),
     gsSPVertex(0x0400CFE0, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 7, 9, 10, 0),
-    gsSP1Quadrangle(11, 12, 13, 14, 0),
-    gsSP1Quadrangle(15, 16, 17, 18, 0),
-    gsSP1Quadrangle(18, 17, 19, 20, 0),
-    gsSP1Quadrangle(21, 22, 23, 24, 0),
-    gsSP1Quadrangle(24, 23, 25, 26, 0),
-    gsSP1Quadrangle(27, 28, 29, 30, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 7, 9, 0, 8, 9, 10, 0),
+    gsSP2Triangles(11, 12, 13, 0, 11, 13, 14, 0),
+    gsSP2Triangles(15, 16, 17, 0, 15, 17, 18, 0),
+    gsSP2Triangles(18, 17, 19, 0, 18, 19, 20, 0),
+    gsSP2Triangles(21, 22, 23, 0, 21, 23, 24, 0),
+    gsSP2Triangles(24, 23, 25, 0, 24, 25, 26, 0),
+    gsSP2Triangles(27, 28, 29, 0, 27, 29, 30, 0),
     gsSPVertex(0x0400D1D0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsSP2Triangles(10, 11, 12, 0, 12, 11, 13, 0),
     gsSP2Triangles(14, 15, 16, 0, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSP2Triangles(24, 25, 26, 0, 26, 27, 28, 0),
     gsSP1Triangle(29, 30, 31, 0),
     gsSPVertex(0x0400D3D0, 32, 0),
@@ -2168,8 +2168,8 @@ Gfx d_course_frappe_snowland_packed_dl_3758[] =
     gsSPVertex(0x0400D5D0, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(6, 7, 8, 0, 8, 9, 10, 0),
-    gsSP1Quadrangle(11, 12, 13, 14, 0),
-    gsSP1Quadrangle(15, 13, 12, 16, 0),
+    gsSP2Triangles(11, 12, 13, 0, 11, 13, 14, 0),
+    gsSP2Triangles(15, 13, 12, 0, 15, 12, 16, 0),
     gsSP2Triangles(10, 17, 18, 0, 17, 19, 18, 0),
     gsSP2Triangles(20, 21, 22, 0, 23, 24, 25, 0),
     gsSP2Triangles(26, 27, 28, 0, 29, 30, 31, 0),
@@ -2185,23 +2185,23 @@ Gfx d_course_frappe_snowland_packed_dl_3758[] =
     gsSP2Triangles(5, 6, 7, 0, 8, 9, 10, 0),
     gsSP2Triangles(11, 12, 13, 0, 14, 15, 16, 0),
     gsSP2Triangles(15, 17, 18, 0, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPVertex(0x0400DBB0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(10, 11, 12, 0, 13, 14, 15, 0),
     gsSP2Triangles(13, 15, 16, 0, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0400DDB0, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSP2Triangles(24, 25, 26, 0, 27, 28, 29, 0),
     gsSPVertex(0x0400DF90, 31, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
@@ -2216,7 +2216,7 @@ Gfx d_course_frappe_snowland_packed_dl_3758[] =
     gsSP2Triangles(12, 13, 14, 0, 15, 16, 13, 0),
     gsSP2Triangles(17, 18, 19, 0, 20, 21, 22, 0),
     gsSP2Triangles(23, 24, 25, 0, 26, 27, 28, 0),
-    gsSP1Quadrangle(29, 30, 19, 31, 0),
+    gsSP2Triangles(29, 30, 19, 0, 29, 19, 31, 0),
     gsSPVertex(0x0400E380, 22, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(6, 7, 8, 0, 9, 10, 11, 0),
@@ -2246,13 +2246,13 @@ Gfx d_course_frappe_snowland_packed_dl_3B48[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400E4E0, 28, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2278,17 +2278,17 @@ Gfx d_course_frappe_snowland_packed_dl_3BD8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400E6E0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0400E8E0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2304,11 +2304,11 @@ Gfx d_course_frappe_snowland_packed_dl_3CD8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400E960, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2324,11 +2324,11 @@ Gfx d_course_frappe_snowland_packed_dl_3D58[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400EAA0, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2344,13 +2344,13 @@ Gfx d_course_frappe_snowland_packed_dl_3DD8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400EBE0, 28, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2366,13 +2366,13 @@ Gfx d_course_frappe_snowland_packed_dl_3E68[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400EDA0, 28, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2388,12 +2388,12 @@ Gfx d_course_frappe_snowland_packed_dl_3EF8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400EF60, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2409,15 +2409,15 @@ Gfx d_course_frappe_snowland_packed_dl_3F80[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400F0E0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05004000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400F120, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2433,13 +2433,13 @@ Gfx d_course_frappe_snowland_packed_dl_4020[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400F1A0, 28, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2455,9 +2455,9 @@ Gfx d_course_frappe_snowland_packed_dl_40B0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400F360, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2473,8 +2473,8 @@ Gfx d_course_frappe_snowland_packed_dl_4120[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400F420, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2490,11 +2490,11 @@ Gfx d_course_frappe_snowland_packed_dl_4188[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400F4A0, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2510,11 +2510,11 @@ Gfx d_course_frappe_snowland_packed_dl_4208[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400F5E0, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2530,10 +2530,10 @@ Gfx d_course_frappe_snowland_packed_dl_4288[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400F720, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2549,10 +2549,10 @@ Gfx d_course_frappe_snowland_packed_dl_4300[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400F820, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2569,8 +2569,8 @@ Gfx d_course_frappe_snowland_packed_dl_4378[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400F920, 12, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2586,14 +2586,14 @@ Gfx d_course_frappe_snowland_packed_dl_43E8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400F9E0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSP2Triangles(24, 25, 26, 0, 24, 27, 25, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0400FBE0, 4, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
     gsSPEndDisplayList(),
@@ -2633,7 +2633,7 @@ Gfx d_course_frappe_snowland_packed_dl_4520[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400FC20, 11, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
     gsSP1Triangle(7, 9, 10, 0),
     gsSPEndDisplayList(),
@@ -2651,10 +2651,10 @@ Gfx d_course_frappe_snowland_packed_dl_4590[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400FCD0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2670,10 +2670,10 @@ Gfx d_course_frappe_snowland_packed_dl_4608[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400FDD0, 14, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(10, 12, 13, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(10, 12, 13, 0, 10, 13, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2689,11 +2689,11 @@ Gfx d_course_frappe_snowland_packed_dl_4680[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400FEB0, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2709,10 +2709,10 @@ Gfx d_course_frappe_snowland_packed_dl_4700[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400FFF0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2728,11 +2728,11 @@ Gfx d_course_frappe_snowland_packed_dl_4778[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040100F0, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2783,13 +2783,13 @@ Gfx d_course_frappe_snowland_packed_dl_48C0[] =
     gsSPVertex(0x040103A0, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 4, 0),
     gsSP2Triangles(0, 2, 3, 0, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 2, 1, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
+    gsSP2Triangles(8, 2, 1, 0, 8, 1, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
     gsSP2Triangles(10, 14, 11, 0, 10, 15, 14, 0),
-    gsSP1Quadrangle(13, 12, 16, 17, 0),
+    gsSP2Triangles(13, 12, 16, 0, 13, 16, 17, 0),
     gsSP2Triangles(2, 8, 3, 0, 18, 19, 20, 0),
     gsSP2Triangles(18, 20, 21, 0, 22, 20, 19, 0),
-    gsSP1Quadrangle(23, 24, 25, 26, 0),
+    gsSP2Triangles(23, 24, 25, 0, 23, 25, 26, 0),
     gsSP2Triangles(27, 24, 28, 0, 25, 24, 27, 0),
     gsSP1Triangle(29, 30, 31, 0),
     gsSPVertex(0x040105A0, 29, 0),
@@ -2799,8 +2799,8 @@ Gfx d_course_frappe_snowland_packed_dl_48C0[] =
     gsSP2Triangles(7, 5, 3, 0, 8, 9, 10, 0),
     gsSP2Triangles(8, 11, 9, 0, 12, 10, 9, 0),
     gsSP2Triangles(12, 9, 13, 0, 9, 11, 13, 0),
-    gsSP1Quadrangle(10, 12, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(10, 12, 14, 0, 10, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSP2Triangles(11, 20, 13, 0, 21, 22, 18, 0),
     gsSP2Triangles(23, 18, 22, 0, 17, 21, 18, 0),
     gsSP2Triangles(23, 24, 18, 0, 18, 24, 19, 0),
@@ -2824,7 +2824,7 @@ Gfx d_course_frappe_snowland_packed_dl_49E0[] =
     gsSP2Triangles(0, 1, 2, 0, 3, 2, 1, 0),
     gsSP2Triangles(4, 2, 5, 0, 3, 5, 2, 0),
     gsSP2Triangles(6, 7, 8, 0, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 10, 14, 0),
+    gsSP2Triangles(12, 13, 10, 0, 12, 10, 14, 0),
     gsSP2Triangles(13, 11, 10, 0, 15, 16, 17, 0),
     gsSP2Triangles(18, 19, 20, 0, 18, 21, 22, 0),
     gsSP2Triangles(18, 22, 19, 0, 18, 20, 23, 0),
@@ -2835,13 +2835,13 @@ Gfx d_course_frappe_snowland_packed_dl_49E0[] =
     gsSP2Triangles(23, 20, 29, 0, 30, 31, 25, 0),
     gsSP1Triangle(30, 25, 24, 0),
     gsSPVertex(0x04010970, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(1, 4, 2, 0, 5, 6, 7, 0),
     gsSP2Triangles(5, 7, 8, 0, 9, 5, 8, 0),
     gsSP2Triangles(10, 7, 6, 0, 7, 11, 12, 0),
     gsSP2Triangles(8, 7, 13, 0, 7, 12, 13, 0),
     gsSP2Triangles(7, 10, 11, 0, 14, 15, 16, 0),
-    gsSP1Quadrangle(16, 8, 17, 18, 0),
+    gsSP2Triangles(16, 8, 17, 0, 16, 17, 18, 0),
     gsSP2Triangles(15, 8, 16, 0, 19, 16, 18, 0),
     gsSP2Triangles(16, 19, 20, 0, 14, 16, 20, 0),
     gsSP2Triangles(8, 13, 17, 0, 19, 18, 21, 0),
@@ -2865,7 +2865,7 @@ Gfx d_course_frappe_snowland_packed_dl_49E0[] =
     gsSP2Triangles(18, 20, 9, 0, 20, 21, 12, 0),
     gsSP2Triangles(12, 21, 22, 0, 12, 23, 13, 0),
     gsSP2Triangles(12, 22, 23, 0, 23, 22, 24, 0),
-    gsSP1Quadrangle(23, 24, 25, 13, 0),
+    gsSP2Triangles(23, 24, 25, 0, 23, 25, 13, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2897,21 +2897,21 @@ Gfx d_course_frappe_snowland_packed_dl_4BA0[] =
     gsSP2Triangles(5, 6, 4, 0, 7, 8, 9, 0),
     gsSP2Triangles(10, 11, 12, 0, 13, 12, 11, 0),
     gsSP2Triangles(13, 14, 12, 0, 15, 12, 14, 0),
-    gsSP1Quadrangle(16, 15, 14, 17, 0),
+    gsSP2Triangles(16, 15, 14, 0, 16, 14, 17, 0),
     gsSP2Triangles(5, 18, 6, 0, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 19, 21, 0),
+    gsSP2Triangles(22, 23, 19, 0, 22, 19, 21, 0),
     gsSP2Triangles(24, 20, 19, 0, 24, 25, 20, 0),
-    gsSP1Quadrangle(26, 25, 24, 27, 0),
+    gsSP2Triangles(26, 25, 24, 0, 26, 24, 27, 0),
     gsSP2Triangles(27, 28, 26, 0, 29, 28, 27, 0),
     gsSPVertex(0x040110E0, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 0, 2, 0),
     gsSP2Triangles(3, 4, 0, 0, 1, 5, 2, 0),
     gsSP2Triangles(3, 2, 6, 0, 6, 2, 7, 0),
-    gsSP1Quadrangle(2, 5, 8, 7, 0),
+    gsSP2Triangles(2, 5, 8, 0, 2, 8, 7, 0),
     gsSP2Triangles(7, 8, 9, 0, 10, 11, 12, 0),
     gsSP2Triangles(13, 14, 15, 0, 13, 16, 14, 0),
     gsSP2Triangles(15, 14, 17, 0, 18, 15, 17, 0),
-    gsSP1Quadrangle(18, 17, 19, 20, 0),
+    gsSP2Triangles(18, 17, 19, 0, 18, 19, 20, 0),
     gsSP2Triangles(20, 19, 21, 0, 22, 4, 3, 0),
     gsSP2Triangles(22, 23, 4, 0, 22, 24, 23, 0),
     gsSP2Triangles(25, 23, 24, 0, 26, 27, 28, 0),
@@ -2933,15 +2933,15 @@ Gfx d_course_frappe_snowland_packed_dl_4D18[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040112E0, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 0, 2, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(4, 7, 8, 0, 9, 10, 11, 0),
     gsSP2Triangles(9, 12, 10, 0, 13, 14, 15, 0),
     gsSP2Triangles(12, 13, 16, 0, 13, 15, 16, 0),
     gsSP2Triangles(14, 17, 15, 0, 12, 16, 10, 0),
-    gsSP1Quadrangle(14, 18, 19, 17, 0),
+    gsSP2Triangles(14, 18, 19, 0, 14, 19, 17, 0),
     gsSP2Triangles(4, 8, 5, 0, 8, 20, 21, 0),
     gsSP2Triangles(8, 21, 5, 0, 21, 22, 5, 0),
-    gsSP1Quadrangle(23, 2, 24, 25, 0),
+    gsSP2Triangles(23, 2, 24, 0, 23, 24, 25, 0),
     gsSP2Triangles(3, 23, 26, 0, 23, 25, 26, 0),
     gsSP2Triangles(23, 3, 2, 0, 26, 25, 27, 0),
     gsSP2Triangles(25, 28, 27, 0, 25, 24, 28, 0),
@@ -2949,13 +2949,13 @@ Gfx d_course_frappe_snowland_packed_dl_4D18[] =
     gsSP2Triangles(30, 26, 29, 0, 2, 31, 24, 0),
     gsSPVertex(0x040114E0, 31, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsSP2Triangles(6, 9, 10, 0, 7, 11, 8, 0),
     gsSP2Triangles(11, 12, 8, 0, 9, 8, 12, 0),
     gsSP2Triangles(9, 12, 13, 0, 11, 14, 12, 0),
     gsSP2Triangles(13, 12, 14, 0, 15, 16, 17, 0),
     gsSP2Triangles(17, 16, 18, 0, 19, 20, 21, 0),
-    gsSP1Quadrangle(21, 20, 22, 23, 0),
+    gsSP2Triangles(21, 20, 22, 0, 21, 22, 23, 0),
     gsSP2Triangles(24, 25, 26, 0, 27, 28, 29, 0),
     gsSP1Triangle(30, 27, 29, 0),
     gsSPEndDisplayList(),
@@ -3003,7 +3003,7 @@ Gfx d_course_frappe_snowland_packed_dl_4F00[] =
     gsSPVertex(0x04011850, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 1, 0),
     gsSP2Triangles(0, 3, 1, 0, 5, 6, 7, 0),
-    gsSP1Quadrangle(7, 6, 8, 9, 0),
+    gsSP2Triangles(7, 6, 8, 0, 7, 8, 9, 0),
     gsSP2Triangles(10, 11, 12, 0, 11, 10, 13, 0),
     gsSP2Triangles(14, 15, 12, 0, 14, 16, 15, 0),
     gsSP2Triangles(14, 17, 16, 0, 10, 12, 18, 0),
@@ -3015,11 +3015,11 @@ Gfx d_course_frappe_snowland_packed_dl_4F00[] =
     gsSP2Triangles(28, 30, 31, 0, 28, 29, 30, 0),
     gsSPVertex(0x04011A50, 17, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 6, 5, 0, 6, 2, 7, 0),
     gsSP2Triangles(1, 7, 2, 0, 9, 10, 11, 0),
     gsSP2Triangles(10, 12, 13, 0, 11, 10, 13, 0),
-    gsSP1Quadrangle(14, 15, 12, 16, 0),
+    gsSP2Triangles(14, 15, 12, 0, 14, 12, 16, 0),
     gsSP1Triangle(15, 13, 12, 0),
     gsSPEndDisplayList(),
 };
@@ -3037,7 +3037,7 @@ Gfx d_course_frappe_snowland_packed_dl_4FF8[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04011B60, 31, 0),
     gsSP2Triangles(0, 1, 2, 0, 2, 1, 3, 0),
-    gsSP1Quadrangle(4, 2, 3, 5, 0),
+    gsSP2Triangles(4, 2, 3, 0, 4, 3, 5, 0),
     gsSP2Triangles(6, 0, 7, 0, 7, 0, 2, 0),
     gsSP2Triangles(8, 9, 10, 0, 4, 5, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 12, 15, 13, 0),
@@ -3049,7 +3049,7 @@ Gfx d_course_frappe_snowland_packed_dl_4FF8[] =
     gsSP2Triangles(27, 28, 29, 0, 27, 30, 18, 0),
     gsSP2Triangles(27, 29, 30, 0, 18, 30, 17, 0),
     gsSPVertex(0x04011D50, 7, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 2, 5, 0, 2, 1, 5, 0),
     gsSP1Triangle(1, 6, 5, 0),
     gsSPEndDisplayList(),
@@ -3074,10 +3074,10 @@ Gfx d_course_frappe_snowland_packed_dl_50D0[] =
     gsSP2Triangles(11, 14, 12, 0, 7, 11, 13, 0),
     gsSP2Triangles(9, 11, 7, 0, 7, 13, 10, 0),
     gsSP2Triangles(3, 2, 5, 0, 15, 16, 17, 0),
-    gsSP1Quadrangle(16, 15, 18, 19, 0),
+    gsSP2Triangles(16, 15, 18, 0, 16, 18, 19, 0),
     gsSP2Triangles(20, 21, 22, 0, 21, 23, 22, 0),
     gsSP2Triangles(24, 17, 16, 0, 25, 26, 27, 0),
-    gsSP1Quadrangle(26, 25, 28, 29, 0),
+    gsSP2Triangles(26, 25, 28, 0, 26, 28, 29, 0),
     gsSP2Triangles(27, 26, 29, 0, 25, 30, 28, 0),
     gsSP1Triangle(31, 24, 16, 0),
     gsSPVertex(0x04011FC0, 16, 0),
@@ -3109,13 +3109,13 @@ Gfx d_course_frappe_snowland_packed_dl_51C8[] =
     gsSP2Triangles(9, 11, 12, 0, 12, 13, 14, 0),
     gsSP2Triangles(12, 14, 9, 0, 13, 15, 14, 0),
     gsSP2Triangles(10, 9, 16, 0, 17, 10, 16, 0),
-    gsSP1Quadrangle(17, 16, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(17, 16, 18, 0, 17, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSP2Triangles(20, 24, 21, 0, 24, 25, 21, 0),
     gsSP2Triangles(26, 27, 24, 0, 25, 24, 27, 0),
     gsSP2Triangles(28, 23, 29, 0, 14, 15, 30, 0),
     gsSPVertex(0x040122B0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 1, 0, 0, 1, 4, 5, 0),
     gsSP2Triangles(6, 7, 8, 0, 7, 9, 8, 0),
     gsSP2Triangles(7, 10, 9, 0, 10, 11, 9, 0),
@@ -3125,7 +3125,7 @@ Gfx d_course_frappe_snowland_packed_dl_51C8[] =
     gsSP2Triangles(18, 19, 16, 0, 18, 21, 19, 0),
     gsSP2Triangles(15, 22, 18, 0, 18, 22, 21, 0),
     gsSP2Triangles(22, 23, 21, 0, 22, 15, 24, 0),
-    gsSP1Quadrangle(22, 24, 25, 23, 0),
+    gsSP2Triangles(22, 24, 25, 0, 22, 25, 23, 0),
     gsSP2Triangles(14, 26, 13, 0, 27, 28, 29, 0),
     gsSP2Triangles(30, 27, 31, 0, 27, 29, 31, 0),
     gsSPVertex(0x040124B0, 18, 0),
@@ -3157,28 +3157,28 @@ Gfx d_course_frappe_snowland_packed_dl_5330[] =
     gsSP2Triangles(3, 5, 10, 0, 9, 11, 12, 0),
     gsSP2Triangles(8, 9, 12, 0, 3, 13, 6, 0),
     gsSP2Triangles(3, 10, 13, 0, 10, 14, 13, 0),
-    gsSP1Quadrangle(15, 14, 16, 17, 0),
+    gsSP2Triangles(15, 14, 16, 0, 15, 16, 17, 0),
     gsSP2Triangles(17, 18, 15, 0, 10, 16, 14, 0),
     gsSP2Triangles(8, 17, 16, 0, 10, 8, 16, 0),
-    gsSP1Quadrangle(17, 19, 20, 18, 0),
+    gsSP2Triangles(17, 19, 20, 0, 17, 20, 18, 0),
     gsSP2Triangles(8, 19, 17, 0, 8, 12, 19, 0),
     gsSP2Triangles(21, 22, 23, 0, 21, 24, 22, 0),
     gsSP2Triangles(25, 24, 26, 0, 25, 22, 24, 0),
     gsSP2Triangles(27, 28, 29, 0, 28, 27, 30, 0),
     gsSP1Triangle(31, 25, 26, 0),
     gsSPVertex(0x040127D0, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(3, 4, 0, 0, 1, 5, 2, 0),
     gsSP2Triangles(1, 6, 5, 0, 3, 2, 7, 0),
     gsSP2Triangles(3, 7, 8, 0, 5, 9, 2, 0),
     gsSP2Triangles(9, 7, 2, 0, 10, 9, 5, 0),
     gsSP2Triangles(10, 5, 11, 0, 6, 11, 5, 0),
-    gsSP1Quadrangle(8, 12, 13, 3, 0),
-    gsSP1Quadrangle(3, 13, 14, 4, 0),
-    gsSP1Quadrangle(15, 16, 17, 18, 0),
+    gsSP2Triangles(8, 12, 13, 0, 8, 13, 3, 0),
+    gsSP2Triangles(3, 13, 14, 0, 3, 14, 4, 0),
+    gsSP2Triangles(15, 16, 17, 0, 15, 17, 18, 0),
     gsSP2Triangles(19, 18, 17, 0, 20, 21, 22, 0),
-    gsSP1Quadrangle(20, 22, 23, 24, 0),
-    gsSP1Quadrangle(25, 26, 22, 21, 0),
+    gsSP2Triangles(20, 22, 23, 0, 20, 23, 24, 0),
+    gsSP2Triangles(25, 26, 22, 0, 25, 22, 21, 0),
     gsSP2Triangles(23, 22, 27, 0, 22, 26, 27, 0),
     gsSP2Triangles(23, 28, 24, 0, 29, 18, 19, 0),
     gsSPVertex(0x040129B0, 10, 0),
@@ -3203,7 +3203,7 @@ Gfx d_course_frappe_snowland_packed_dl_54A0[] =
     gsSPVertex(0x04012A50, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(6, 3, 5, 0, 7, 3, 6, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSP2Triangles(12, 6, 5, 0, 13, 6, 12, 0),
     gsSP2Triangles(13, 14, 6, 0, 14, 15, 6, 0),
     gsSP2Triangles(15, 7, 6, 0, 16, 17, 18, 0),
@@ -3224,10 +3224,10 @@ Gfx d_course_frappe_snowland_packed_dl_54A0[] =
     gsSP2Triangles(20, 21, 22, 0, 22, 21, 23, 0),
     gsSP2Triangles(21, 24, 23, 0, 25, 26, 27, 0),
     gsSP2Triangles(25, 27, 28, 0, 29, 25, 28, 0),
-    gsSP1Quadrangle(30, 28, 20, 31, 0),
+    gsSP2Triangles(30, 28, 20, 0, 30, 20, 31, 0),
     gsSP2Triangles(30, 29, 28, 0, 20, 22, 31, 0),
     gsSPVertex(0x04012E50, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3247,7 +3247,7 @@ Gfx d_course_frappe_snowland_packed_dl_55D0[] =
     gsSP2Triangles(4, 6, 0, 0, 4, 3, 7, 0),
     gsSP2Triangles(4, 7, 6, 0, 6, 1, 0, 0),
     gsSP2Triangles(8, 9, 10, 0, 8, 11, 9, 0),
-    gsSP1Quadrangle(12, 8, 10, 13, 0),
+    gsSP2Triangles(12, 8, 10, 0, 12, 10, 13, 0),
     gsSP2Triangles(10, 14, 13, 0, 14, 15, 13, 0),
     gsSP2Triangles(16, 15, 17, 0, 15, 16, 13, 0),
     gsSP2Triangles(6, 18, 19, 0, 6, 7, 18, 0),
@@ -3257,7 +3257,7 @@ Gfx d_course_frappe_snowland_packed_dl_55D0[] =
     gsSP2Triangles(25, 26, 27, 0, 26, 28, 29, 0),
     gsSP1Triangle(26, 29, 27, 0),
     gsSPVertex(0x04013070, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(2, 1, 4, 0, 4, 1, 5, 0),
     gsSP2Triangles(6, 2, 4, 0, 6, 3, 2, 0),
     gsSP2Triangles(4, 5, 7, 0, 8, 9, 10, 0),
@@ -3267,12 +3267,12 @@ Gfx d_course_frappe_snowland_packed_dl_55D0[] =
     gsSP2Triangles(9, 16, 17, 0, 10, 9, 17, 0),
     gsSP2Triangles(5, 18, 7, 0, 7, 18, 19, 0),
     gsSP2Triangles(7, 19, 20, 0, 10, 17, 21, 0),
-    gsSP1Quadrangle(12, 10, 21, 22, 0),
+    gsSP2Triangles(12, 10, 21, 0, 12, 21, 22, 0),
     gsSP2Triangles(12, 22, 23, 0, 13, 12, 24, 0),
     gsSP2Triangles(12, 23, 25, 0, 24, 12, 25, 0),
     gsSP2Triangles(26, 24, 27, 0, 24, 25, 27, 0),
-    gsSP1Quadrangle(15, 14, 28, 16, 0),
-    gsSP1Quadrangle(20, 19, 29, 30, 0),
+    gsSP2Triangles(15, 14, 28, 0, 15, 28, 16, 0),
+    gsSP2Triangles(20, 19, 29, 0, 20, 29, 30, 0),
     gsSP1Triangle(30, 29, 31, 0),
     gsSPVertex(0x04013270, 7, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
@@ -3297,8 +3297,8 @@ Gfx d_course_frappe_snowland_packed_dl_5740[] =
     gsSP2Triangles(3, 5, 6, 0, 4, 2, 5, 0),
     gsSP2Triangles(7, 8, 9, 0, 10, 8, 11, 0),
     gsSP2Triangles(10, 11, 12, 0, 1, 5, 2, 0),
-    gsSP1Quadrangle(13, 6, 5, 14, 0),
-    gsSP1Quadrangle(14, 5, 1, 15, 0),
+    gsSP2Triangles(13, 6, 5, 0, 13, 5, 14, 0),
+    gsSP2Triangles(14, 5, 1, 0, 14, 1, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 19, 16, 20, 0),
     gsSP2Triangles(16, 18, 20, 0, 21, 18, 17, 0),
     gsSP2Triangles(22, 20, 18, 0, 19, 20, 23, 0),
@@ -3309,7 +3309,7 @@ Gfx d_course_frappe_snowland_packed_dl_5740[] =
     gsSP2Triangles(28, 24, 26, 0, 30, 28, 29, 0),
     gsSPVertex(0x040134D0, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 1, 4, 0),
-    gsSP1Quadrangle(3, 5, 2, 1, 0),
+    gsSP2Triangles(3, 5, 2, 0, 3, 2, 1, 0),
     gsSP2Triangles(3, 4, 6, 0, 4, 7, 6, 0),
     gsSP2Triangles(8, 9, 10, 0, 8, 11, 9, 0),
     gsSP2Triangles(12, 11, 13, 0, 9, 11, 14, 0),
@@ -3328,7 +3328,7 @@ Gfx d_course_frappe_snowland_packed_dl_5740[] =
     gsSP2Triangles(3, 4, 1, 0, 5, 6, 7, 0),
     gsSP2Triangles(5, 8, 6, 0, 6, 9, 7, 0),
     gsSP2Triangles(6, 10, 9, 0, 11, 12, 13, 0),
-    gsSP1Quadrangle(13, 14, 15, 11, 0),
+    gsSP2Triangles(13, 14, 15, 0, 13, 15, 11, 0),
     gsSP1Triangle(11, 16, 12, 0),
     gsSPEndDisplayList(),
 };
@@ -3377,7 +3377,7 @@ Gfx d_course_frappe_snowland_packed_dl_5988[] =
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
     gsSP2Triangles(3, 4, 1, 0, 1, 4, 2, 0),
     gsSP2Triangles(5, 6, 2, 0, 4, 5, 2, 0),
-    gsSP1Quadrangle(6, 5, 7, 8, 0),
+    gsSP2Triangles(6, 5, 7, 0, 6, 7, 8, 0),
     gsSP2Triangles(9, 10, 11, 0, 12, 9, 13, 0),
     gsSP2Triangles(12, 10, 9, 0, 13, 9, 14, 0),
     gsSP2Triangles(9, 11, 14, 0, 15, 16, 17, 0),
@@ -3399,7 +3399,7 @@ Gfx d_course_frappe_snowland_packed_dl_5A20[] =
     gsSPVertex(0x04013AE0, 25, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
     gsSP2Triangles(3, 4, 2, 0, 5, 6, 7, 0),
-    gsSP1Quadrangle(3, 7, 6, 4, 0),
+    gsSP2Triangles(3, 7, 6, 0, 3, 6, 4, 0),
     gsSP2Triangles(3, 1, 7, 0, 8, 9, 10, 0),
     gsSP2Triangles(9, 8, 11, 0, 8, 10, 12, 0),
     gsSP2Triangles(13, 14, 15, 0, 14, 16, 17, 0),
@@ -3423,7 +3423,7 @@ Gfx d_course_frappe_snowland_packed_dl_5AC0[] =
     gsSPVertex(0x04013C70, 21, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
     gsSP2Triangles(4, 2, 1, 0, 5, 4, 1, 0),
-    gsSP1Quadrangle(6, 0, 2, 7, 0),
+    gsSP2Triangles(6, 0, 2, 0, 6, 2, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 11, 12, 13, 0),
     gsSP2Triangles(14, 11, 13, 0, 15, 16, 17, 0),
     gsSP2Triangles(15, 18, 16, 0, 13, 17, 16, 0),
@@ -3445,7 +3445,7 @@ Gfx d_course_frappe_snowland_packed_dl_5B58[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04013DC0, 22, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(6, 3, 5, 7, 0),
+    gsSP2Triangles(6, 3, 5, 0, 6, 5, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 8, 11, 9, 0),
     gsSP2Triangles(12, 13, 14, 0, 14, 15, 12, 0),
     gsSP2Triangles(16, 17, 18, 0, 18, 17, 19, 0),
@@ -3466,7 +3466,7 @@ Gfx d_course_frappe_snowland_packed_dl_5BE0[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04013F20, 21, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(3, 5, 2, 6, 0),
+    gsSP2Triangles(3, 5, 2, 0, 3, 2, 6, 0),
     gsSP2Triangles(2, 1, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(7, 9, 10, 0, 9, 11, 10, 0),
     gsSP2Triangles(9, 8, 12, 0, 13, 11, 9, 0),
@@ -3553,7 +3553,7 @@ Gfx d_course_frappe_snowland_packed_dl_5E08[] =
     gsSP2Triangles(0, 7, 10, 0, 1, 0, 11, 0),
     gsSP2Triangles(0, 10, 11, 0, 8, 12, 13, 0),
     gsSP2Triangles(8, 13, 9, 0, 14, 15, 16, 0),
-    gsSP1Quadrangle(15, 17, 18, 16, 0),
+    gsSP2Triangles(15, 17, 18, 0, 15, 18, 16, 0),
     gsSP2Triangles(17, 19, 18, 0, 17, 20, 19, 0),
     gsSPEndDisplayList(),
 };
@@ -3583,7 +3583,7 @@ Gfx d_course_frappe_snowland_packed_dl_5EA8[] =
     gsSP2Triangles(23, 24, 22, 0, 21, 25, 23, 0),
     gsSP2Triangles(25, 26, 23, 0, 26, 24, 23, 0),
     gsSP2Triangles(27, 7, 28, 0, 7, 6, 28, 0),
-    gsSP1Quadrangle(7, 27, 29, 8, 0),
+    gsSP2Triangles(7, 27, 29, 0, 7, 29, 8, 0),
     gsSPVertex(0x040147C0, 9, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 4, 0),
     gsSP2Triangles(1, 4, 2, 0, 5, 6, 7, 0),
@@ -3603,24 +3603,24 @@ Gfx d_course_frappe_snowland_packed_dl_5F90[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04014850, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(0, 4, 5, 0, 0, 3, 4, 0),
     gsSP2Triangles(6, 4, 3, 0, 5, 4, 7, 0),
     gsSP2Triangles(4, 8, 7, 0, 4, 6, 8, 0),
     gsSP2Triangles(5, 7, 9, 0, 10, 5, 9, 0),
     gsSP2Triangles(7, 11, 9, 0, 12, 13, 14, 0),
-    gsSP1Quadrangle(13, 15, 16, 14, 0),
+    gsSP2Triangles(13, 15, 16, 0, 13, 16, 14, 0),
     gsSP2Triangles(17, 18, 19, 0, 20, 17, 16, 0),
     gsSP2Triangles(17, 19, 16, 0, 10, 9, 21, 0),
-    gsSP1Quadrangle(9, 11, 22, 21, 0),
+    gsSP2Triangles(9, 11, 22, 0, 9, 22, 21, 0),
     gsSP2Triangles(15, 20, 16, 0, 23, 24, 25, 0),
     gsSP2Triangles(23, 26, 27, 0, 28, 26, 23, 0),
     gsSP2Triangles(23, 27, 24, 0, 29, 30, 31, 0),
     gsSPVertex(0x04014A50, 18, 0),
     gsSP2Triangles(0, 1, 2, 0, 2, 3, 4, 0),
     gsSP2Triangles(0, 5, 1, 0, 6, 7, 8, 0),
-    gsSP1Quadrangle(9, 10, 11, 12, 0),
-    gsSP1Quadrangle(13, 11, 10, 14, 0),
+    gsSP2Triangles(9, 10, 11, 0, 9, 11, 12, 0),
+    gsSP2Triangles(13, 11, 10, 0, 13, 10, 14, 0),
     gsSP2Triangles(13, 14, 15, 0, 16, 13, 15, 0),
     gsSP1Triangle(16, 15, 17, 0),
     gsSPEndDisplayList(),
@@ -3638,28 +3638,28 @@ Gfx d_course_frappe_snowland_packed_dl_6088[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04014B70, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 1, 5, 0, 1, 6, 2, 0),
     gsSP2Triangles(1, 4, 6, 0, 7, 8, 5, 0),
     gsSP2Triangles(9, 5, 8, 0, 4, 5, 9, 0),
-    gsSP1Quadrangle(10, 8, 7, 11, 0),
+    gsSP2Triangles(10, 8, 7, 0, 10, 7, 11, 0),
     gsSP2Triangles(4, 9, 12, 0, 6, 4, 12, 0),
-    gsSP1Quadrangle(9, 8, 13, 12, 0),
+    gsSP2Triangles(9, 8, 13, 0, 9, 13, 12, 0),
     gsSP2Triangles(10, 13, 8, 0, 10, 14, 13, 0),
     gsSP2Triangles(10, 11, 14, 0, 15, 6, 12, 0),
     gsSP2Triangles(2, 6, 15, 0, 16, 17, 18, 0),
     gsSP2Triangles(16, 19, 17, 0, 20, 21, 22, 0),
-    gsSP1Quadrangle(20, 22, 23, 24, 0),
+    gsSP2Triangles(20, 22, 23, 0, 20, 23, 24, 0),
     gsSP2Triangles(23, 25, 24, 0, 26, 27, 28, 0),
     gsSP2Triangles(29, 26, 30, 0, 26, 28, 30, 0),
     gsSPVertex(0x04014D60, 19, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 1, 0, 0, 3, 5, 6, 0),
     gsSP2Triangles(7, 3, 8, 0, 5, 3, 7, 0),
     gsSP2Triangles(3, 2, 8, 0, 9, 10, 11, 0),
     gsSP2Triangles(10, 12, 11, 0, 5, 7, 13, 0),
     gsSP2Triangles(14, 13, 15, 0, 13, 7, 15, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
     gsSP2Triangles(7, 8, 15, 0, 2, 1, 18, 0),
     gsSP1Triangle(2, 18, 8, 0),
     gsSPEndDisplayList(),
@@ -3689,7 +3689,7 @@ Gfx d_course_frappe_snowland_packed_dl_61A0[] =
     gsSP2Triangles(21, 24, 27, 0, 26, 21, 27, 0),
     gsSP2Triangles(28, 17, 16, 0, 26, 27, 29, 0),
     gsSPVertex(0x04015070, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(1, 4, 2, 0, 5, 6, 7, 0),
     gsSPEndDisplayList(),
 };
@@ -3707,8 +3707,8 @@ Gfx d_course_frappe_snowland_packed_dl_6268[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040150F0, 18, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(4, 3, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 6, 0),
+    gsSP2Triangles(4, 3, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 6, 0),
     gsSP2Triangles(11, 10, 9, 0, 12, 10, 11, 0),
     gsSP2Triangles(12, 13, 10, 0, 6, 10, 7, 0),
     gsSP2Triangles(10, 13, 7, 0, 14, 12, 11, 0),
@@ -3752,53 +3752,53 @@ Gfx d_course_frappe_snowland_packed_dl_63D8[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x04015210, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 1, 0, 0),
-    gsSP1Quadrangle(0, 3, 6, 7, 0),
-    gsSP1Quadrangle(4, 0, 7, 8, 0),
-    gsSP1Quadrangle(3, 2, 9, 10, 0),
-    gsSP1Quadrangle(3, 10, 11, 6, 0),
-    gsSP1Quadrangle(12, 13, 5, 4, 0),
-    gsSP1Quadrangle(12, 4, 8, 14, 0),
-    gsSP1Quadrangle(15, 16, 13, 12, 0),
-    gsSP1Quadrangle(15, 12, 14, 17, 0),
-    gsSP1Quadrangle(18, 19, 16, 15, 0),
-    gsSP1Quadrangle(18, 15, 17, 20, 0),
-    gsSP1Quadrangle(21, 22, 19, 18, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0),
+    gsSP2Triangles(0, 3, 6, 0, 0, 6, 7, 0),
+    gsSP2Triangles(4, 0, 7, 0, 4, 7, 8, 0),
+    gsSP2Triangles(3, 2, 9, 0, 3, 9, 10, 0),
+    gsSP2Triangles(3, 10, 11, 0, 3, 11, 6, 0),
+    gsSP2Triangles(12, 13, 5, 0, 12, 5, 4, 0),
+    gsSP2Triangles(12, 4, 8, 0, 12, 8, 14, 0),
+    gsSP2Triangles(15, 16, 13, 0, 15, 13, 12, 0),
+    gsSP2Triangles(15, 12, 14, 0, 15, 14, 17, 0),
+    gsSP2Triangles(18, 19, 16, 0, 18, 16, 15, 0),
+    gsSP2Triangles(18, 15, 17, 0, 18, 17, 20, 0),
+    gsSP2Triangles(21, 22, 19, 0, 21, 19, 18, 0),
     gsSP2Triangles(23, 22, 21, 0, 21, 18, 20, 0),
-    gsSP1Quadrangle(21, 20, 24, 25, 0),
+    gsSP2Triangles(21, 20, 24, 0, 21, 24, 25, 0),
     gsSP2Triangles(21, 25, 23, 0, 10, 9, 26, 0),
-    gsSP1Quadrangle(10, 26, 27, 28, 0),
+    gsSP2Triangles(10, 26, 27, 0, 10, 27, 28, 0),
     gsSP2Triangles(10, 28, 11, 0, 29, 30, 31, 0),
     gsSPVertex(0x04015410, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 6, 0),
-    gsSP1Quadrangle(3, 2, 6, 7, 0),
-    gsSP1Quadrangle(6, 5, 8, 9, 0),
-    gsSP1Quadrangle(7, 6, 9, 10, 0),
-    gsSP1Quadrangle(11, 12, 13, 14, 0),
-    gsSP1Quadrangle(15, 16, 12, 11, 0),
-    gsSP1Quadrangle(15, 11, 10, 17, 0),
-    gsSP1Quadrangle(11, 14, 7, 10, 0),
-    gsSP1Quadrangle(14, 13, 18, 19, 0),
-    gsSP1Quadrangle(14, 19, 3, 7, 0),
-    gsSP1Quadrangle(20, 21, 16, 15, 0),
-    gsSP1Quadrangle(20, 15, 17, 22, 0),
-    gsSP1Quadrangle(23, 24, 21, 20, 0),
-    gsSP1Quadrangle(23, 20, 22, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
-    gsSP1Quadrangle(30, 31, 27, 26, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 6, 0),
+    gsSP2Triangles(3, 2, 6, 0, 3, 6, 7, 0),
+    gsSP2Triangles(6, 5, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(7, 6, 9, 0, 7, 9, 10, 0),
+    gsSP2Triangles(11, 12, 13, 0, 11, 13, 14, 0),
+    gsSP2Triangles(15, 16, 12, 0, 15, 12, 11, 0),
+    gsSP2Triangles(15, 11, 10, 0, 15, 10, 17, 0),
+    gsSP2Triangles(11, 14, 7, 0, 11, 7, 10, 0),
+    gsSP2Triangles(14, 13, 18, 0, 14, 18, 19, 0),
+    gsSP2Triangles(14, 19, 3, 0, 14, 3, 7, 0),
+    gsSP2Triangles(20, 21, 16, 0, 20, 16, 15, 0),
+    gsSP2Triangles(20, 15, 17, 0, 20, 17, 22, 0),
+    gsSP2Triangles(23, 24, 21, 0, 23, 21, 20, 0),
+    gsSP2Triangles(23, 20, 22, 0, 23, 22, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
+    gsSP2Triangles(30, 31, 27, 0, 30, 27, 26, 0),
     gsSPVertex(0x04015610, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 1, 0, 0),
-    gsSP1Quadrangle(2, 6, 7, 8, 0),
-    gsSP1Quadrangle(3, 2, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 11, 10, 0),
-    gsSP1Quadrangle(13, 12, 16, 5, 0),
-    gsSP1Quadrangle(17, 10, 13, 18, 0),
-    gsSP1Quadrangle(18, 13, 5, 4, 0),
-    gsSP1Quadrangle(19, 20, 21, 22, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0),
+    gsSP2Triangles(2, 6, 7, 0, 2, 7, 8, 0),
+    gsSP2Triangles(3, 2, 8, 0, 3, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 11, 0, 14, 11, 10, 0),
+    gsSP2Triangles(13, 12, 16, 0, 13, 16, 5, 0),
+    gsSP2Triangles(17, 10, 13, 0, 17, 13, 18, 0),
+    gsSP2Triangles(18, 13, 5, 0, 18, 5, 4, 0),
+    gsSP2Triangles(19, 20, 21, 0, 19, 21, 22, 0),
     gsSP2Triangles(19, 22, 23, 0, 24, 25, 26, 0),
     gsSP2Triangles(24, 26, 27, 0, 28, 29, 25, 0),
     gsSP2Triangles(28, 25, 24, 0, 30, 28, 24, 0),
diff --git a/courses/flower_cup/mario_raceway/course_data.inc.c b/courses/flower_cup/mario_raceway/course_data.inc.c
index e36801a43..54189602c 100644
--- a/courses/flower_cup/mario_raceway/course_data.inc.c
+++ b/courses/flower_cup/mario_raceway/course_data.inc.c
@@ -3622,7 +3622,7 @@ Gfx d_course_mario_raceway_dl_piranha_plant[] =
     gsDPSetTextureLUT(G_TT_RGBA16),
     gsDPLoadTLUT_pal256(d_course_mario_raceway_piranha_plant_tlut),
     gsSPVertex(d_course_mario_raceway_piranha_plant_model, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPEndDisplayList(),
 };
@@ -3777,10 +3777,10 @@ Gfx d_course_mario_raceway_dl_9068[] =
     gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(d_course_mario_raceway_sign_model, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 1, 0, 0),
-    gsSP1Quadrangle(3, 2, 6, 7, 0),
-    gsSP1Quadrangle(7, 6, 5, 4, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0),
+    gsSP2Triangles(3, 2, 6, 0, 3, 6, 7, 0),
+    gsSP2Triangles(7, 6, 5, 0, 7, 5, 4, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3796,27 +3796,27 @@ Gfx d_course_mario_raceway_dl_90C0[] =
     gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(d_course_mario_raceway_06006B88, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 0, 3, 5, 0),
-    gsSP1Quadrangle(6, 7, 0, 4, 0),
-    gsSP1Quadrangle(7, 8, 1, 0, 0),
-    gsSP1Quadrangle(9, 10, 11, 12, 0),
-    gsSP1Quadrangle(10, 13, 14, 11, 0),
-    gsSP1Quadrangle(12, 11, 15, 16, 0),
-    gsSP1Quadrangle(11, 14, 17, 15, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(19, 22, 23, 20, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(25, 28, 29, 26, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 0, 3, 0, 4, 3, 5, 0),
+    gsSP2Triangles(6, 7, 0, 0, 6, 0, 4, 0),
+    gsSP2Triangles(7, 8, 1, 0, 7, 1, 0, 0),
+    gsSP2Triangles(9, 10, 11, 0, 9, 11, 12, 0),
+    gsSP2Triangles(10, 13, 14, 0, 10, 14, 11, 0),
+    gsSP2Triangles(12, 11, 15, 0, 12, 15, 16, 0),
+    gsSP2Triangles(11, 14, 17, 0, 11, 17, 15, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(19, 22, 23, 0, 19, 23, 20, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(25, 28, 29, 0, 25, 29, 26, 0),
     gsSPVertex(d_course_mario_raceway_06006D68, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 6, 9, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(13, 16, 17, 14, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(19, 22, 23, 20, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 6, 9, 0, 10, 9, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(13, 16, 17, 0, 13, 17, 14, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(19, 22, 23, 0, 19, 23, 20, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3835,16 +3835,16 @@ Gfx d_course_mario_raceway_dl_9190[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(d_course_mario_raceway_06006EE8, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, d_course_mario_raceway_sign_right),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(d_course_mario_raceway_06006F48, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 4, 5, 0, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 4, 5, 0, 3, 5, 0, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3863,16 +3863,16 @@ Gfx d_course_mario_raceway_dl_9250[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(d_course_mario_raceway_06006FA8, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 4, 5, 0, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 4, 5, 0, 3, 5, 0, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, d_course_mario_raceway_sign_right),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(d_course_mario_raceway_06007008, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
     gsSPEndDisplayList(),
 };
 
diff --git a/courses/flower_cup/mario_raceway/packed.inc.c b/courses/flower_cup/mario_raceway/packed.inc.c
index c2062a485..83276055c 100644
--- a/courses/flower_cup/mario_raceway/packed.inc.c
+++ b/courses/flower_cup/mario_raceway/packed.inc.c
@@ -17,9 +17,9 @@ Gfx d_course_mario_raceway_packed_dl_0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000000, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -35,9 +35,9 @@ Gfx d_course_mario_raceway_packed_dl_70[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040000C0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -60,8 +60,8 @@ Gfx d_course_mario_raceway_packed_dl_F8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000180, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -83,7 +83,7 @@ Gfx d_course_mario_raceway_packed_dl_170[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000200, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 4, 7, 5, 0),
     gsSPEndDisplayList(),
 };
@@ -124,7 +124,7 @@ Gfx d_course_mario_raceway_packed_dl_258[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000300, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 4, 7, 5, 0),
     gsSPEndDisplayList(),
 };
@@ -141,7 +141,7 @@ Gfx d_course_mario_raceway_packed_dl_2C0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000380, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 4, 7, 5, 0),
     gsSPEndDisplayList(),
 };
@@ -159,13 +159,13 @@ Gfx d_course_mario_raceway_packed_dl_328[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000400, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 12, 15, 13, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSP2Triangles(20, 21, 22, 0, 20, 23, 21, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04000600, 8, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
     gsSP2Triangles(4, 5, 6, 0, 4, 7, 5, 0),
@@ -184,9 +184,9 @@ Gfx d_course_mario_raceway_packed_dl_3D8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000680, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 12, 15, 13, 0),
     gsSPEndDisplayList(),
 };
@@ -227,22 +227,22 @@ Gfx d_course_mario_raceway_packed_dl_4B0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000780, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04000980, 26, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 5, 7, 6, 0),
     gsSP2Triangles(7, 8, 6, 0, 9, 10, 11, 0),
     gsSP2Triangles(10, 12, 11, 0, 12, 13, 11, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
     gsSPEndDisplayList(),
 };
 
@@ -258,103 +258,103 @@ Gfx d_course_mario_raceway_packed_dl_588[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000B20, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04000D20, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(17, 20, 21, 22, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(17, 20, 21, 0, 17, 21, 22, 0),
     gsSP2Triangles(23, 24, 25, 0, 26, 27, 28, 0),
     gsSP1Triangle(29, 30, 31, 0),
     gsSPVertex(0x04000F20, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 19, 20, 21, 0),
     gsSP2Triangles(19, 21, 22, 0, 23, 24, 25, 0),
     gsSP2Triangles(23, 25, 26, 0, 27, 28, 29, 0),
     gsSP1Triangle(27, 29, 30, 0),
     gsSPVertex(0x04001110, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04001310, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04001510, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(21, 24, 25, 26, 0),
-    gsSP1Quadrangle(27, 28, 29, 30, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(21, 24, 25, 0, 21, 25, 26, 0),
+    gsSP2Triangles(27, 28, 29, 0, 27, 29, 30, 0),
     gsSPVertex(0x04001700, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04001900, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04001B00, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04001D00, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04001F00, 28, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSPEndDisplayList(),
 };
 
@@ -435,7 +435,7 @@ Gfx d_course_mario_raceway_packed_dl_A08[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04002360, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -460,7 +460,7 @@ Gfx d_course_mario_raceway_packed_dl_B10[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04002400, 13, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(6, 3, 5, 7, 0),
+    gsSP2Triangles(6, 3, 5, 0, 6, 5, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 9, 11, 12, 0),
     gsSP1Triangle(9, 12, 10, 0),
     gsDPTileSync(),
@@ -526,7 +526,7 @@ Gfx d_course_mario_raceway_packed_dl_D20[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040026A0, 6, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
-    gsSP1Quadrangle(3, 1, 4, 5, 0),
+    gsSP2Triangles(3, 1, 4, 0, 3, 4, 5, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05004000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
@@ -546,7 +546,7 @@ Gfx d_course_mario_raceway_packed_dl_D20[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040027F0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -583,7 +583,7 @@ Gfx d_course_mario_raceway_packed_dl_E28[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04002980, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -620,7 +620,7 @@ Gfx d_course_mario_raceway_packed_dl_F30[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04002AF0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -686,9 +686,9 @@ Gfx d_course_mario_raceway_packed_dl_1188[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04002CA0, 17, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(0, 4, 1, 0, 4, 5, 1, 0),
-    gsSP1Quadrangle(4, 6, 7, 5, 0),
+    gsSP2Triangles(4, 6, 7, 0, 4, 7, 5, 0),
     gsSP2Triangles(8, 9, 10, 0, 9, 11, 12, 0),
     gsSP2Triangles(9, 12, 10, 0, 13, 8, 10, 0),
     gsSP2Triangles(14, 13, 10, 0, 13, 15, 16, 0),
@@ -702,7 +702,7 @@ Gfx d_course_mario_raceway_packed_dl_1188[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04002DB0, 18, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(1, 4, 5, 0, 6, 1, 0, 0),
     gsSP2Triangles(6, 0, 7, 0, 8, 4, 1, 0),
     gsSP2Triangles(8, 1, 9, 0, 1, 6, 9, 0),
@@ -719,18 +719,18 @@ Gfx d_course_mario_raceway_packed_dl_1188[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04002ED0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05009000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04002F90, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -746,10 +746,10 @@ Gfx d_course_mario_raceway_packed_dl_1348[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04003050, 14, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 8, 11, 9, 0),
-    gsSP1Quadrangle(9, 12, 13, 10, 0),
+    gsSP2Triangles(9, 12, 13, 0, 9, 13, 10, 0),
     gsSPEndDisplayList(),
 };
 
@@ -757,10 +757,10 @@ Gfx d_course_mario_raceway_packed_dl_13C0[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x04003130, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 0, 3, 0, 5, 0, 4, 0),
     gsSP2Triangles(2, 1, 6, 0, 6, 1, 7, 0),
-    gsSP1Quadrangle(8, 4, 3, 9, 0),
+    gsSP2Triangles(8, 4, 3, 0, 8, 3, 9, 0),
     gsSP2Triangles(8, 5, 4, 0, 10, 8, 11, 0),
     gsSP2Triangles(12, 6, 7, 0, 13, 14, 8, 0),
     gsSP2Triangles(15, 14, 13, 0, 15, 16, 14, 0),
@@ -784,8 +784,8 @@ Gfx d_course_mario_raceway_packed_dl_1438[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040032B0, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
     gsSPEndDisplayList(),
 };
 
@@ -802,10 +802,10 @@ Gfx d_course_mario_raceway_packed_dl_14C8[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04003310, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -813,13 +813,13 @@ Gfx d_course_mario_raceway_packed_dl_1500[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04003410, 27, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(7, 8, 9, 10, 0),
-    gsSP1Quadrangle(11, 12, 13, 14, 0),
-    gsSP1Quadrangle(15, 16, 17, 18, 0),
-    gsSP1Quadrangle(19, 20, 21, 22, 0),
-    gsSP1Quadrangle(23, 24, 25, 26, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(7, 8, 9, 0, 7, 9, 10, 0),
+    gsSP2Triangles(11, 12, 13, 0, 11, 13, 14, 0),
+    gsSP2Triangles(15, 16, 17, 0, 15, 17, 18, 0),
+    gsSP2Triangles(19, 20, 21, 0, 19, 21, 22, 0),
+    gsSP2Triangles(23, 24, 25, 0, 23, 25, 26, 0),
     gsSPEndDisplayList(),
 };
 
@@ -827,25 +827,25 @@ Gfx d_course_mario_raceway_packed_dl_1550[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x040035C0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x040037C0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x040039C0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -853,16 +853,16 @@ Gfx d_course_mario_raceway_packed_dl_1600[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04003A00, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(3, 16, 17, 18, 0),
-    gsSP1Quadrangle(19, 20, 21, 22, 0),
-    gsSP1Quadrangle(23, 24, 25, 19, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(3, 16, 17, 0, 3, 17, 18, 0),
+    gsSP2Triangles(19, 20, 21, 0, 19, 21, 22, 0),
+    gsSP2Triangles(23, 24, 25, 0, 23, 25, 19, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPVertex(0x04003BE0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -870,17 +870,17 @@ Gfx d_course_mario_raceway_packed_dl_1668[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04003C20, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04003E20, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -888,22 +888,22 @@ Gfx d_course_mario_raceway_packed_dl_16D8[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04003EA0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x040040A0, 27, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 16, 0),
-    gsSP1Quadrangle(23, 24, 25, 26, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 16, 0),
+    gsSP2Triangles(23, 24, 25, 0, 23, 25, 26, 0),
     gsSPEndDisplayList(),
 };
 
@@ -911,16 +911,16 @@ Gfx d_course_mario_raceway_packed_dl_1770[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04004250, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04004450, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -928,8 +928,8 @@ Gfx d_course_mario_raceway_packed_dl_17D8[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04004490, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_MIRROR | G_TX_WRAP, 6, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x007C),
@@ -939,7 +939,7 @@ Gfx d_course_mario_raceway_packed_dl_17D8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04004510, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -947,11 +947,11 @@ Gfx d_course_mario_raceway_packed_dl_1850[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04004550, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -959,8 +959,8 @@ Gfx d_course_mario_raceway_packed_dl_1890[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04004690, 7, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 0, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 0, 0),
     gsSPEndDisplayList(),
 };
 
@@ -968,8 +968,8 @@ Gfx d_course_mario_raceway_packed_dl_18B8[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04004700, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -977,12 +977,12 @@ Gfx d_course_mario_raceway_packed_dl_18E0[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04004780, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSP2Triangles(24, 25, 26, 0, 27, 28, 24, 0),
     gsSP2Triangles(27, 24, 26, 0, 29, 30, 31, 0),
     gsSPVertex(0x04004980, 8, 0),
@@ -995,10 +995,10 @@ Gfx d_course_mario_raceway_packed_dl_1950[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04004A00, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1006,19 +1006,19 @@ Gfx d_course_mario_raceway_packed_dl_1988[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04004B00, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04004D00, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1026,18 +1026,18 @@ Gfx d_course_mario_raceway_packed_dl_1A08[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04004E00, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04005000, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1045,18 +1045,18 @@ Gfx d_course_mario_raceway_packed_dl_1A80[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x040050C0, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(3, 20, 21, 22, 0),
-    gsSP1Quadrangle(23, 24, 25, 26, 0),
-    gsSP1Quadrangle(27, 28, 29, 30, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(3, 20, 21, 0, 3, 21, 22, 0),
+    gsSP2Triangles(23, 24, 25, 0, 23, 25, 26, 0),
+    gsSP2Triangles(27, 28, 29, 0, 27, 29, 30, 0),
     gsSPVertex(0x040052B0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1064,9 +1064,9 @@ Gfx d_course_mario_raceway_packed_dl_1AF8[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04005370, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1104,8 +1104,8 @@ Gfx d_course_mario_raceway_packed_dl_1BB8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04005430, 26, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 7, 9, 0, 10, 11, 12, 0),
     gsSP2Triangles(10, 12, 13, 0, 14, 15, 16, 0),
     gsSP2Triangles(14, 16, 17, 0, 18, 19, 20, 0),
@@ -1126,12 +1126,12 @@ Gfx d_course_mario_raceway_packed_dl_1C48[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040055D0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSP2Triangles(24, 25, 26, 0, 24, 27, 25, 0),
     gsSP2Triangles(24, 26, 28, 0, 29, 30, 31, 0),
     gsSPVertex(0x040057D0, 7, 0),
@@ -1152,17 +1152,17 @@ Gfx d_course_mario_raceway_packed_dl_1CF8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04005840, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04005A40, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1178,12 +1178,12 @@ Gfx d_course_mario_raceway_packed_dl_1DA8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04005AC0, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1199,10 +1199,10 @@ Gfx d_course_mario_raceway_packed_dl_1E30[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04005C40, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1218,12 +1218,12 @@ Gfx d_course_mario_raceway_packed_dl_1EA8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04005D40, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 1, 0, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
+    gsSP2Triangles(6, 7, 1, 0, 6, 1, 0, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1239,11 +1239,11 @@ Gfx d_course_mario_raceway_packed_dl_1F30[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04005E80, 18, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(7, 6, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(7, 6, 8, 0, 7, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1259,12 +1259,12 @@ Gfx d_course_mario_raceway_packed_dl_1FB0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04005FA0, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1280,10 +1280,10 @@ Gfx d_course_mario_raceway_packed_dl_2038[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04006120, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1299,12 +1299,12 @@ Gfx d_course_mario_raceway_packed_dl_20B0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04006220, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1320,12 +1320,12 @@ Gfx d_course_mario_raceway_packed_dl_2138[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040063A0, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1341,12 +1341,12 @@ Gfx d_course_mario_raceway_packed_dl_21C0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04006520, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1362,9 +1362,9 @@ Gfx d_course_mario_raceway_packed_dl_2248[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040066A0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1380,12 +1380,12 @@ Gfx d_course_mario_raceway_packed_dl_22B8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04006760, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1401,10 +1401,10 @@ Gfx d_course_mario_raceway_packed_dl_2340[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040068E0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1420,8 +1420,8 @@ Gfx d_course_mario_raceway_packed_dl_23B8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040069E0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1437,10 +1437,10 @@ Gfx d_course_mario_raceway_packed_dl_2420[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04006A60, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 1, 0, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(9, 8, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(9, 8, 10, 0, 9, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1456,10 +1456,10 @@ Gfx d_course_mario_raceway_packed_dl_2498[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04006B20, 14, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(11, 10, 12, 13, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(11, 10, 12, 0, 11, 12, 13, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1475,10 +1475,10 @@ Gfx d_course_mario_raceway_packed_dl_2510[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04006C00, 14, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(11, 10, 12, 13, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(11, 10, 12, 0, 11, 12, 13, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1494,10 +1494,10 @@ Gfx d_course_mario_raceway_packed_dl_2588[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04006CE0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 1, 0, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(9, 8, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(9, 8, 10, 0, 9, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1513,11 +1513,11 @@ Gfx d_course_mario_raceway_packed_dl_2600[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04006DA0, 18, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 13, 12, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 13, 0, 16, 13, 12, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1533,10 +1533,10 @@ Gfx d_course_mario_raceway_packed_dl_2680[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04006EC0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 1, 0, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(7, 10, 11, 8, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(7, 10, 11, 0, 7, 11, 8, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1552,8 +1552,8 @@ Gfx d_course_mario_raceway_packed_dl_26F8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04006F80, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1569,12 +1569,12 @@ Gfx d_course_mario_raceway_packed_dl_2760[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04007000, 22, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 15, 14, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 15, 14, 0, 16, 14, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1590,12 +1590,12 @@ Gfx d_course_mario_raceway_packed_dl_27E8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04007160, 22, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(13, 16, 17, 14, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(13, 16, 17, 0, 13, 17, 14, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1611,12 +1611,12 @@ Gfx d_course_mario_raceway_packed_dl_2870[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040072C0, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1632,12 +1632,12 @@ Gfx d_course_mario_raceway_packed_dl_28F8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04007440, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
     gsSP2Triangles(19, 18, 22, 0, 23, 24, 25, 0),
     gsSP2Triangles(23, 25, 26, 0, 26, 25, 27, 0),
     gsSP2Triangles(26, 27, 28, 0, 29, 30, 31, 0),
@@ -1659,10 +1659,10 @@ Gfx d_course_mario_raceway_packed_dl_29B0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040076B0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1711,12 +1711,12 @@ Gfx d_course_mario_raceway_packed_dl_2B10[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040077B0, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1732,53 +1732,53 @@ Gfx d_course_mario_raceway_packed_dl_2B98[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04007930, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(4, 16, 17, 5, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(4, 16, 17, 0, 4, 17, 5, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPVertex(0x04007B10, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04007D10, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04007F10, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(0, 28, 29, 30, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(0, 28, 29, 0, 0, 29, 30, 0),
     gsSPVertex(0x04008100, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(4, 8, 9, 5, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(4, 8, 9, 0, 4, 9, 5, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPVertex(0x040082E0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1793,39 +1793,39 @@ Gfx d_course_mario_raceway_packed_dl_2D80[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x04008360, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 0, 3, 5, 0),
-    gsSP1Quadrangle(6, 2, 1, 7, 0),
-    gsSP1Quadrangle(6, 8, 9, 2, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(13, 12, 14, 15, 0),
-    gsSP1Quadrangle(16, 6, 7, 17, 0),
-    gsSP1Quadrangle(16, 18, 8, 6, 0),
-    gsSP1Quadrangle(19, 20, 21, 22, 0),
-    gsSP1Quadrangle(20, 23, 24, 21, 0),
-    gsSP1Quadrangle(21, 24, 18, 16, 0),
-    gsSP1Quadrangle(21, 16, 17, 22, 0),
-    gsSP1Quadrangle(15, 14, 25, 26, 0),
-    gsSP1Quadrangle(27, 28, 29, 30, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 0, 3, 0, 4, 3, 5, 0),
+    gsSP2Triangles(6, 2, 1, 0, 6, 1, 7, 0),
+    gsSP2Triangles(6, 8, 9, 0, 6, 9, 2, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(13, 12, 14, 0, 13, 14, 15, 0),
+    gsSP2Triangles(16, 6, 7, 0, 16, 7, 17, 0),
+    gsSP2Triangles(16, 18, 8, 0, 16, 8, 6, 0),
+    gsSP2Triangles(19, 20, 21, 0, 19, 21, 22, 0),
+    gsSP2Triangles(20, 23, 24, 0, 20, 24, 21, 0),
+    gsSP2Triangles(21, 24, 18, 0, 21, 18, 16, 0),
+    gsSP2Triangles(21, 16, 17, 0, 21, 17, 22, 0),
+    gsSP2Triangles(15, 14, 25, 0, 15, 25, 26, 0),
+    gsSP2Triangles(27, 28, 29, 0, 27, 29, 30, 0),
     gsSP1Triangle(27, 30, 31, 0),
     gsSPVertex(0x04008560, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 1, 0),
-    gsSP1Quadrangle(11, 12, 9, 8, 0),
-    gsSP1Quadrangle(5, 13, 14, 6, 0),
-    gsSP1Quadrangle(15, 16, 17, 18, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 1, 0),
+    gsSP2Triangles(11, 12, 9, 0, 11, 9, 8, 0),
+    gsSP2Triangles(5, 13, 14, 0, 5, 14, 6, 0),
+    gsSP2Triangles(15, 16, 17, 0, 15, 17, 18, 0),
     gsSP2Triangles(15, 18, 19, 0, 20, 21, 15, 0),
-    gsSP1Quadrangle(22, 20, 15, 19, 0),
-    gsSP1Quadrangle(15, 21, 23, 16, 0),
-    gsSP1Quadrangle(16, 23, 24, 25, 0),
-    gsSP1Quadrangle(17, 16, 25, 26, 0),
-    gsSP1Quadrangle(25, 24, 27, 28, 0),
-    gsSP1Quadrangle(26, 25, 28, 29, 0),
-    gsSP1Quadrangle(19, 30, 20, 22, 0),
+    gsSP2Triangles(22, 20, 15, 0, 22, 15, 19, 0),
+    gsSP2Triangles(15, 21, 23, 0, 15, 23, 16, 0),
+    gsSP2Triangles(16, 23, 24, 0, 16, 24, 25, 0),
+    gsSP2Triangles(17, 16, 25, 0, 17, 25, 26, 0),
+    gsSP2Triangles(25, 24, 27, 0, 25, 27, 28, 0),
+    gsSP2Triangles(26, 25, 28, 0, 26, 28, 29, 0),
+    gsSP2Triangles(19, 30, 20, 0, 19, 20, 22, 0),
     gsSPVertex(0x04008750, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(0, 3, 4, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0),
     gsSP2Triangles(0, 5, 6, 0, 2, 7, 4, 0),
     gsSP2Triangles(2, 4, 3, 0, 8, 9, 10, 0),
     gsSP2Triangles(8, 10, 11, 0, 9, 12, 13, 0),
@@ -1839,35 +1839,35 @@ Gfx d_course_mario_raceway_packed_dl_2D80[] =
     gsSP2Triangles(29, 24, 23, 0, 20, 25, 31, 0),
     gsSP1Triangle(20, 31, 26, 0),
     gsSPVertex(0x04008950, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 4, 5, 0, 0),
-    gsSP1Quadrangle(3, 2, 6, 7, 0),
-    gsSP1Quadrangle(7, 8, 4, 3, 0),
-    gsSP1Quadrangle(7, 6, 9, 10, 0),
-    gsSP1Quadrangle(10, 11, 8, 7, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(15, 16, 17, 12, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 19, 18, 0),
-    gsSP1Quadrangle(18, 21, 24, 22, 0),
-    gsSP1Quadrangle(12, 17, 23, 22, 0),
-    gsSP1Quadrangle(22, 24, 13, 12, 0),
-    gsSP1Quadrangle(10, 9, 25, 26, 0),
-    gsSP1Quadrangle(26, 27, 11, 10, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 4, 5, 0, 3, 5, 0, 0),
+    gsSP2Triangles(3, 2, 6, 0, 3, 6, 7, 0),
+    gsSP2Triangles(7, 8, 4, 0, 7, 4, 3, 0),
+    gsSP2Triangles(7, 6, 9, 0, 7, 9, 10, 0),
+    gsSP2Triangles(10, 11, 8, 0, 10, 8, 7, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(15, 16, 17, 0, 15, 17, 12, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 19, 0, 22, 19, 18, 0),
+    gsSP2Triangles(18, 21, 24, 0, 18, 24, 22, 0),
+    gsSP2Triangles(12, 17, 23, 0, 12, 23, 22, 0),
+    gsSP2Triangles(22, 24, 13, 0, 22, 13, 12, 0),
+    gsSP2Triangles(10, 9, 25, 0, 10, 25, 26, 0),
+    gsSP2Triangles(26, 27, 11, 0, 26, 11, 10, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04008B50, 25, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(7, 8, 9, 2, 0),
-    gsSP1Quadrangle(6, 10, 8, 7, 0),
-    gsSP1Quadrangle(2, 9, 11, 3, 0),
-    gsSP1Quadrangle(12, 13, 6, 5, 0),
-    gsSP1Quadrangle(14, 15, 13, 12, 0),
-    gsSP1Quadrangle(16, 17, 18, 15, 0),
-    gsSP1Quadrangle(19, 0, 3, 20, 0),
-    gsSP1Quadrangle(20, 21, 22, 19, 0),
-    gsSP1Quadrangle(3, 11, 23, 20, 0),
-    gsSP1Quadrangle(20, 23, 24, 21, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(7, 8, 9, 0, 7, 9, 2, 0),
+    gsSP2Triangles(6, 10, 8, 0, 6, 8, 7, 0),
+    gsSP2Triangles(2, 9, 11, 0, 2, 11, 3, 0),
+    gsSP2Triangles(12, 13, 6, 0, 12, 6, 5, 0),
+    gsSP2Triangles(14, 15, 13, 0, 14, 13, 12, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 15, 0),
+    gsSP2Triangles(19, 0, 3, 0, 19, 3, 20, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 19, 0),
+    gsSP2Triangles(3, 11, 23, 0, 3, 23, 20, 0),
+    gsSP2Triangles(20, 23, 24, 0, 20, 24, 21, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
@@ -1878,7 +1878,7 @@ Gfx d_course_mario_raceway_packed_dl_2D80[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04008CE0, 5, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP1Triangle(0, 3, 4, 0),
     gsSPEndDisplayList(),
 };
@@ -1901,8 +1901,8 @@ Gfx d_course_mario_raceway_packed_dl_3060[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04008D30, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 6, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x007C),
@@ -1912,14 +1912,14 @@ Gfx d_course_mario_raceway_packed_dl_3060[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04008DB0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05007000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04008DF0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1935,14 +1935,14 @@ Gfx d_course_mario_raceway_packed_dl_3150[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04008E30, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05015800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04008E70, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -1953,7 +1953,7 @@ Gfx d_course_mario_raceway_packed_dl_3150[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04008EB0, 8, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1976,7 +1976,7 @@ Gfx d_course_mario_raceway_packed_dl_3258[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04008F30, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500B800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
@@ -1999,7 +1999,7 @@ Gfx d_course_mario_raceway_packed_dl_32F0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04008FB0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05009000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
@@ -2026,7 +2026,7 @@ Gfx d_course_mario_raceway_packed_dl_3388[] =
     gsSP2Triangles(4, 5, 6, 0, 4, 7, 5, 0),
     gsSP2Triangles(8, 9, 10, 0, 8, 11, 9, 0),
     gsSP2Triangles(12, 13, 14, 0, 12, 15, 13, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05013800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
@@ -2054,7 +2054,7 @@ Gfx d_course_mario_raceway_packed_dl_3460[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040092B0, 8, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05011800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
@@ -3379,7 +3379,7 @@ Gfx d_course_mario_raceway_packed_dl_56F0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04012270, 18, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 4, 7, 5, 0),
     gsSP2Triangles(8, 9, 10, 0, 11, 12, 13, 0),
     gsSP2Triangles(13, 12, 14, 0, 15, 16, 17, 0),
@@ -3474,7 +3474,7 @@ Gfx d_course_mario_raceway_packed_dl_5970[] =
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(6, 7, 8, 0, 9, 7, 10, 0),
     gsSP2Triangles(11, 12, 13, 0, 14, 15, 16, 0),
-    gsSP1Quadrangle(17, 18, 19, 20, 0),
+    gsSP2Triangles(17, 18, 19, 0, 17, 19, 20, 0),
     gsSP2Triangles(21, 22, 23, 0, 21, 24, 25, 0),
     gsSP2Triangles(26, 27, 28, 0, 29, 4, 30, 0),
     gsSPVertex(0x040131A0, 31, 0),
@@ -3604,7 +3604,7 @@ Gfx d_course_mario_raceway_packed_dl_5CE8[] =
     gsSPVertex(0x04013FE0, 31, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(6, 7, 8, 0, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 19, 20, 21, 0),
     gsSP2Triangles(22, 23, 24, 0, 25, 26, 27, 0),
     gsSP1Triangle(28, 29, 30, 0),
@@ -3643,7 +3643,7 @@ Gfx d_course_mario_raceway_packed_dl_5DF0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04014300, 5, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP1Triangle(4, 0, 3, 0),
     gsSPEndDisplayList(),
 };
@@ -3826,7 +3826,7 @@ Gfx d_course_mario_raceway_packed_dl_62A0[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040153A0, 8, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 1, 0, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3991,44 +3991,44 @@ Gfx d_course_mario_raceway_packed_dl_6710[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04015EB0, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(4, 28, 29, 30, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(4, 28, 29, 0, 4, 29, 30, 0),
     gsSPVertex(0x040160A0, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(4, 7, 8, 0, 4, 9, 10, 0),
     gsSP2Triangles(11, 12, 13, 0, 11, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSP1Triangle(28, 29, 30, 0),
     gsSPVertex(0x04016290, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04016490, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04016690, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 11, 12, 13, 0),
     gsSP2Triangles(11, 14, 15, 0, 8, 16, 17, 0),
     gsSP1Triangle(8, 18, 19, 0),
diff --git a/courses/flower_cup/toads_turnpike/course_data.inc.c b/courses/flower_cup/toads_turnpike/course_data.inc.c
index a5711e97a..bf8995e71 100644
--- a/courses/flower_cup/toads_turnpike/course_data.inc.c
+++ b/courses/flower_cup/toads_turnpike/course_data.inc.c
@@ -3636,8 +3636,8 @@ Gfx d_course_toads_turnpike_dl_18DB8[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_toads_turnpike_truck_model_lod0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3656,8 +3656,8 @@ Gfx d_course_toads_turnpike_dl_18E38[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_toads_turnpike_truck_unknown_model1, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3676,12 +3676,12 @@ Gfx d_course_toads_turnpike_dl_18EB8[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_toads_turnpike_truck_unknown_model2, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
-    gsSP1Quadrangle(6, 7, 5, 4, 0),
-    gsSP1Quadrangle(8, 9, 7, 6, 0),
-    gsSP1Quadrangle(8, 10, 11, 9, 0),
-    gsSP1Quadrangle(10, 0, 3, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
+    gsSP2Triangles(6, 7, 5, 0, 6, 5, 4, 0),
+    gsSP2Triangles(8, 9, 7, 0, 8, 7, 6, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0),
+    gsSP2Triangles(10, 0, 3, 0, 10, 3, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3700,12 +3700,12 @@ Gfx d_course_toads_turnpike_dl_18F58[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_toads_turnpike_truck_unknown_model3, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
-    gsSP1Quadrangle(6, 7, 5, 4, 0),
-    gsSP1Quadrangle(8, 9, 7, 6, 0),
-    gsSP1Quadrangle(8, 10, 11, 9, 0),
-    gsSP1Quadrangle(10, 0, 3, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
+    gsSP2Triangles(6, 7, 5, 0, 6, 5, 4, 0),
+    gsSP2Triangles(8, 9, 7, 0, 8, 7, 6, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0),
+    gsSP2Triangles(10, 0, 3, 0, 10, 3, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3739,15 +3739,15 @@ Gfx d_course_toads_turnpike_dl_19030[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_toads_turnpike_truck_unknown_model4, 28, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(20, 16, 19, 21, 0),
-    gsSP1Quadrangle(22, 24, 25, 23, 0),
-    gsSP1Quadrangle(24, 26, 27, 25, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(20, 16, 19, 0, 20, 19, 21, 0),
+    gsSP2Triangles(22, 24, 25, 0, 22, 25, 23, 0),
+    gsSP2Triangles(24, 26, 27, 0, 24, 27, 25, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3767,7 +3767,7 @@ Gfx d_course_toads_turnpike_dl_190E8[] =
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_toads_turnpike_truck_unknown_model5, 10, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3793,13 +3793,13 @@ Gfx d_course_toads_turnpike_dl_19168[] =
     gsSP2Triangles(10, 12, 13, 0, 10, 14, 11, 0),
     gsSP2Triangles(15, 11, 16, 0, 17, 18, 19, 0),
     gsSP2Triangles(17, 19, 20, 0, 20, 21, 17, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
     gsSP2Triangles(26, 27, 24, 0, 24, 28, 25, 0),
-    gsSP1Quadrangle(25, 29, 30, 22, 0),
+    gsSP2Triangles(25, 29, 30, 0, 25, 30, 22, 0),
     gsSPVertex(d_course_toads_turnpike_truck_unknown_model7, 10, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -3811,8 +3811,8 @@ Gfx d_course_toads_turnpike_dl_19168[] =
     gsSPVertex(d_course_toads_turnpike_truck_unknown_model8, 14, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(3, 5, 0, 0, 6, 7, 5, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(10, 12, 13, 11, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(10, 12, 13, 0, 10, 13, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3832,7 +3832,7 @@ Gfx d_course_toads_turnpike_dl_192B0[] =
     gsSPClearGeometryMode(G_LIGHTING),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPVertex(d_course_toads_turnpike_truck_unknown_model9, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -3842,9 +3842,9 @@ Gfx d_course_toads_turnpike_dl_192B0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(d_course_toads_turnpike_truck_unknown_model10, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(0, 4, 5, 1, 0),
-    gsSP1Quadrangle(6, 3, 2, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(0, 4, 5, 0, 0, 5, 1, 0),
+    gsSP2Triangles(6, 3, 2, 0, 6, 2, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3856,22 +3856,22 @@ Gfx d_course_toads_turnpike_dl_19390[] =
     gsSPClearGeometryMode(G_LIGHTING),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPVertex(d_course_toads_turnpike_truck_unknown_model11, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, d_course_toads_turnpike_unk_windshield1),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(d_course_toads_turnpike_truck_unknown_model12, 15, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(0, 3, 4, 0, 1, 5, 2, 0),
-    gsSP1Quadrangle(3, 2, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 4, 0),
-    gsSP1Quadrangle(7, 6, 11, 12, 0),
+    gsSP2Triangles(3, 2, 6, 0, 3, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 4, 0),
+    gsSP2Triangles(7, 6, 11, 0, 7, 11, 12, 0),
     gsSP2Triangles(7, 12, 13, 0, 6, 14, 11, 0),
     gsSPEndDisplayList(),
 };
@@ -3891,10 +3891,10 @@ Gfx d_course_toads_turnpike_dl_19450[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_toads_turnpike_truck_unknown_model13, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(7, 6, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 5, 4, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(7, 6, 8, 0, 7, 8, 9, 0),
+    gsSP2Triangles(10, 11, 5, 0, 10, 5, 4, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4076,10 +4076,10 @@ Gfx d_course_toads_turnpike_dl_19CF8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(d_course_toads_turnpike_truck_model_lod1, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4094,10 +4094,10 @@ Gfx d_course_toads_turnpike_dl_19D68[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(d_course_toads_turnpike_truck_unknown_model14, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4117,11 +4117,11 @@ Gfx d_course_toads_turnpike_dl_19DF0[] =
 Gfx d_course_toads_turnpike_dl_19E00[] =
 {
     gsSPVertex(d_course_toads_turnpike_truck_unknown_model15, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4136,9 +4136,9 @@ Gfx d_course_toads_turnpike_dl_19E38[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(d_course_toads_turnpike_truck_unknown_model16, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4153,9 +4153,9 @@ Gfx d_course_toads_turnpike_dl_19EA0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(d_course_toads_turnpike_truck_unknown_model17, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4187,10 +4187,10 @@ Gfx d_course_toads_turnpike_dl_19F08[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(d_course_toads_turnpike_truck_unknown_model19, 18, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(0, 4, 5, 1, 0),
-    gsSP1Quadrangle(2, 6, 7, 3, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(0, 4, 5, 0, 0, 5, 1, 0),
+    gsSP2Triangles(2, 6, 7, 0, 2, 7, 3, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 15, 16, 17, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, d_course_toads_turnpike_unk_windshield1),
     gsDPTileSync(),
@@ -4198,7 +4198,7 @@ Gfx d_course_toads_turnpike_dl_19F08[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(d_course_toads_turnpike_truck_unknown_model20, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4312,10 +4312,10 @@ Gfx d_course_toads_turnpike_dl_1A4B8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(d_course_toads_turnpike_truck_model_lod2, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4330,7 +4330,7 @@ Gfx d_course_toads_turnpike_dl_1A528[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(d_course_toads_turnpike_truck_unknown_model21, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -4340,9 +4340,9 @@ Gfx d_course_toads_turnpike_dl_1A528[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(d_course_toads_turnpike_truck_unknown_model22, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4362,11 +4362,11 @@ Gfx d_course_toads_turnpike_dl_1A5F8[] =
 Gfx d_course_toads_turnpike_dl_1A608[] =
 {
     gsSPVertex(d_course_toads_turnpike_truck_unknown_model23, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4381,10 +4381,10 @@ Gfx d_course_toads_turnpike_dl_1A640[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(d_course_toads_turnpike_truck_unknown_model24, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4704,10 +4704,10 @@ Gfx d_course_toads_turnpike_dl_1B5C8[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_toads_turnpike_bus_model_lod0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4726,8 +4726,8 @@ Gfx d_course_toads_turnpike_dl_1B658[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_toads_turnpike_bus_unknown_model1, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4746,8 +4746,8 @@ Gfx d_course_toads_turnpike_dl_1B6D8[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_toads_turnpike_bus_unknown_model2, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4780,9 +4780,9 @@ Gfx d_course_toads_turnpike_dl_1B788[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_toads_turnpike_bus_unknown_model3, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 0, 3, 0),
-    gsSP1Quadrangle(1, 6, 7, 2, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 0, 0, 4, 0, 3, 0),
+    gsSP2Triangles(1, 6, 7, 0, 1, 7, 2, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4801,10 +4801,10 @@ Gfx d_course_toads_turnpike_dl_1B810[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_toads_turnpike_bus_unknown_model4, 10, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 4, 5, 0, 0),
-    gsSP1Quadrangle(4, 6, 7, 5, 0),
-    gsSP1Quadrangle(8, 0, 5, 9, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 4, 5, 0, 3, 5, 0, 0),
+    gsSP2Triangles(4, 6, 7, 0, 4, 7, 5, 0),
+    gsSP2Triangles(8, 0, 5, 0, 8, 5, 9, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4824,8 +4824,8 @@ Gfx d_course_toads_turnpike_dl_1B8A0[] =
     gsSPClearGeometryMode(G_LIGHTING),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPVertex(d_course_toads_turnpike_bus_unknown_model5, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -4836,7 +4836,7 @@ Gfx d_course_toads_turnpike_dl_1B8A0[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPVertex(d_course_toads_turnpike_bus_unknown_model6, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -4847,12 +4847,12 @@ Gfx d_course_toads_turnpike_dl_1B8A0[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPVertex(d_course_toads_turnpike_bus_unknown_model7, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
     gsSP2Triangles(6, 7, 8, 0, 7, 9, 8, 0),
     gsSP2Triangles(9, 10, 8, 0, 11, 12, 13, 0),
     gsSP2Triangles(12, 14, 13, 0, 15, 11, 13, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -4863,11 +4863,11 @@ Gfx d_course_toads_turnpike_dl_1B8A0[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPVertex(d_course_toads_turnpike_bus_unknown_model8, 21, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(9, 12, 13, 10, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(9, 12, 13, 0, 9, 13, 10, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
     gsSP2Triangles(14, 17, 18, 0, 17, 19, 20, 0),
     gsSP1Triangle(17, 20, 18, 0),
     gsDPTileSync(),
@@ -4880,9 +4880,9 @@ Gfx d_course_toads_turnpike_dl_1B8A0[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPVertex(d_course_toads_turnpike_bus_unknown_model9, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 3, 2, 0),
-    gsSP1Quadrangle(6, 7, 5, 4, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 3, 0, 4, 3, 2, 0),
+    gsSP2Triangles(6, 7, 5, 0, 6, 5, 4, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 6, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x007C),
@@ -4893,32 +4893,32 @@ Gfx d_course_toads_turnpike_dl_1B8A0[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPVertex(d_course_toads_turnpike_bus_unknown_model10, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(1, 0, 4, 0, 0, 5, 4, 0),
-    gsSP1Quadrangle(6, 7, 2, 1, 0),
+    gsSP2Triangles(6, 7, 2, 0, 6, 2, 1, 0),
     gsSP2Triangles(6, 1, 1, 0, 2, 8, 9, 0),
     gsSP2Triangles(2, 9, 3, 0, 8, 10, 11, 0),
     gsSP2Triangles(8, 11, 9, 0, 12, 13, 14, 0),
     gsSP2Triangles(12, 14, 15, 0, 14, 16, 17, 0),
-    gsSP1Quadrangle(14, 17, 17, 15, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
+    gsSP2Triangles(14, 17, 17, 0, 14, 17, 15, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
     gsSP2Triangles(26, 27, 28, 0, 29, 30, 31, 0),
     gsSPVertex(d_course_toads_turnpike_bus_unknown_model11, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 4, 0),
-    gsSP1Quadrangle(5, 2, 1, 4, 0),
+    gsSP2Triangles(5, 2, 1, 0, 5, 1, 4, 0),
     gsSP2Triangles(6, 2, 5, 0, 7, 8, 9, 0),
     gsSP2Triangles(7, 9, 10, 0, 11, 12, 13, 0),
     gsSP2Triangles(11, 13, 14, 0, 15, 16, 11, 0),
     gsSP2Triangles(15, 11, 14, 0, 17, 18, 13, 0),
     gsSP2Triangles(17, 13, 12, 0, 19, 20, 21, 0),
     gsSP2Triangles(19, 21, 22, 0, 23, 24, 25, 0),
-    gsSP1Quadrangle(24, 23, 26, 27, 0),
-    gsSP1Quadrangle(23, 25, 28, 29, 0),
+    gsSP2Triangles(24, 23, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(23, 25, 28, 0, 23, 28, 29, 0),
     gsSP1Triangle(30, 31, 26, 0),
     gsSPVertex(d_course_toads_turnpike_bus_unknown_model12, 10, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 1, 0),
-    gsSP1Quadrangle(5, 6, 7, 8, 0),
+    gsSP2Triangles(5, 6, 7, 0, 5, 7, 8, 0),
     gsSP1Triangle(5, 8, 9, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_MIRROR | G_TX_WRAP, 6, G_TX_NOLOD),
@@ -4929,9 +4929,9 @@ Gfx d_course_toads_turnpike_dl_1B8A0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(d_course_toads_turnpike_bus_unknown_model13, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 4, 5, 0, 0),
-    gsSP1Quadrangle(4, 6, 7, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 4, 5, 0, 3, 5, 0, 0),
+    gsSP2Triangles(4, 6, 7, 0, 4, 7, 5, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4950,18 +4950,18 @@ Gfx d_course_toads_turnpike_dl_1BC78[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_toads_turnpike_bus_unknown_model14, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 1, 0, 0),
-    gsSP1Quadrangle(3, 2, 6, 7, 0),
-    gsSP1Quadrangle(7, 6, 8, 9, 0),
-    gsSP1Quadrangle(9, 8, 10, 11, 0),
-    gsSP1Quadrangle(11, 10, 5, 4, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 13, 12, 0),
-    gsSP1Quadrangle(15, 14, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 17, 16, 0),
-    gsSP1Quadrangle(19, 18, 22, 23, 0),
-    gsSP1Quadrangle(23, 22, 21, 20, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0),
+    gsSP2Triangles(3, 2, 6, 0, 3, 6, 7, 0),
+    gsSP2Triangles(7, 6, 8, 0, 7, 8, 9, 0),
+    gsSP2Triangles(9, 8, 10, 0, 9, 10, 11, 0),
+    gsSP2Triangles(11, 10, 5, 0, 11, 5, 4, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 13, 0, 16, 13, 12, 0),
+    gsSP2Triangles(15, 14, 18, 0, 15, 18, 19, 0),
+    gsSP2Triangles(20, 21, 17, 0, 20, 17, 16, 0),
+    gsSP2Triangles(19, 18, 22, 0, 19, 22, 23, 0),
+    gsSP2Triangles(23, 22, 21, 0, 23, 21, 20, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4980,18 +4980,18 @@ Gfx d_course_toads_turnpike_dl_1BD48[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_toads_turnpike_bus_unknown_model15, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 1, 0, 0),
-    gsSP1Quadrangle(3, 2, 6, 7, 0),
-    gsSP1Quadrangle(7, 6, 8, 9, 0),
-    gsSP1Quadrangle(9, 8, 10, 11, 0),
-    gsSP1Quadrangle(11, 10, 5, 4, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(15, 14, 16, 17, 0),
-    gsSP1Quadrangle(17, 16, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 13, 12, 0),
-    gsSP1Quadrangle(19, 18, 22, 23, 0),
-    gsSP1Quadrangle(23, 22, 21, 20, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0),
+    gsSP2Triangles(3, 2, 6, 0, 3, 6, 7, 0),
+    gsSP2Triangles(7, 6, 8, 0, 7, 8, 9, 0),
+    gsSP2Triangles(9, 8, 10, 0, 9, 10, 11, 0),
+    gsSP2Triangles(11, 10, 5, 0, 11, 5, 4, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(15, 14, 16, 0, 15, 16, 17, 0),
+    gsSP2Triangles(17, 16, 18, 0, 17, 18, 19, 0),
+    gsSP2Triangles(20, 21, 13, 0, 20, 13, 12, 0),
+    gsSP2Triangles(19, 18, 22, 0, 19, 22, 23, 0),
+    gsSP2Triangles(23, 22, 21, 0, 23, 21, 20, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5181,8 +5181,8 @@ Gfx d_course_toads_turnpike_dl_1C628[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(d_course_toads_turnpike_bus_model_lod1, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5197,8 +5197,8 @@ Gfx d_course_toads_turnpike_dl_1C688[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(d_course_toads_turnpike_bus_unknown_model16, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5226,8 +5226,8 @@ Gfx d_course_toads_turnpike_dl_1C710[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(d_course_toads_turnpike_bus_unknown_model17, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5242,8 +5242,8 @@ Gfx d_course_toads_turnpike_dl_1C770[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(d_course_toads_turnpike_bus_unknown_model18, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5258,7 +5258,7 @@ Gfx d_course_toads_turnpike_dl_1C7D0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(d_course_toads_turnpike_bus_unknown_model19, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_MIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_MIRROR | G_TX_WRAP, 6, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x007C),
@@ -5268,7 +5268,7 @@ Gfx d_course_toads_turnpike_dl_1C7D0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(d_course_toads_turnpike_bus_unknown_model20, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_MIRROR | G_TX_WRAP, 6, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x007C),
@@ -5278,7 +5278,7 @@ Gfx d_course_toads_turnpike_dl_1C7D0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(d_course_toads_turnpike_bus_unknown_model21, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -5288,7 +5288,7 @@ Gfx d_course_toads_turnpike_dl_1C7D0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(d_course_toads_turnpike_bus_unknown_model22, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(0, 3, 4, 0, 3, 5, 4, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
@@ -5300,24 +5300,24 @@ Gfx d_course_toads_turnpike_dl_1C7D0[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(d_course_toads_turnpike_bus_unknown_model23, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
-    gsSP1Quadrangle(4, 0, 2, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(4, 0, 2, 0, 4, 2, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsSP2Triangles(6, 10, 11, 0, 6, 9, 10, 0),
-    gsSP1Quadrangle(6, 11, 4, 5, 0),
-    gsSP1Quadrangle(2, 12, 13, 5, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
+    gsSP2Triangles(6, 11, 4, 0, 6, 4, 5, 0),
+    gsSP2Triangles(2, 12, 13, 0, 2, 13, 5, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
     gsSP2Triangles(14, 17, 18, 0, 14, 19, 15, 0),
-    gsSP1Quadrangle(14, 20, 21, 19, 0),
-    gsSP1Quadrangle(20, 22, 23, 21, 0),
-    gsSP1Quadrangle(24, 25, 23, 22, 0),
-    gsSP1Quadrangle(20, 26, 27, 22, 0),
+    gsSP2Triangles(14, 20, 21, 0, 14, 21, 19, 0),
+    gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0),
+    gsSP2Triangles(24, 25, 23, 0, 24, 23, 22, 0),
+    gsSP2Triangles(20, 26, 27, 0, 20, 27, 22, 0),
     gsSP2Triangles(24, 28, 25, 0, 28, 29, 30, 0),
     gsSP2Triangles(28, 30, 25, 0, 28, 31, 29, 0),
     gsSPVertex(d_course_toads_turnpike_bus_unknown_model24, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSP2Triangles(13, 16, 16, 0, 17, 12, 15, 0),
     gsSP2Triangles(17, 15, 18, 0, 19, 20, 21, 0),
     gsSP2Triangles(19, 21, 22, 0, 23, 24, 25, 0),
@@ -5332,9 +5332,9 @@ Gfx d_course_toads_turnpike_dl_1C7D0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(d_course_toads_turnpike_bus_unknown_model25, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5431,8 +5431,8 @@ Gfx d_course_toads_turnpike_dl_1CD98[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(d_course_toads_turnpike_bus_model_lod2, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5447,8 +5447,8 @@ Gfx d_course_toads_turnpike_dl_1CDF8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(d_course_toads_turnpike_bus_unknown_model26, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5476,21 +5476,21 @@ Gfx d_course_toads_turnpike_dl_1CE80[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(d_course_toads_turnpike_bus_unknown_model27, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, d_course_toads_turnpike_bus_back_lod1),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(d_course_toads_turnpike_bus_unknown_model28, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, d_course_toads_turnpike_bus_door_lod1),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(d_course_toads_turnpike_bus_unknown_model29, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -5500,8 +5500,8 @@ Gfx d_course_toads_turnpike_dl_1CE80[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(d_course_toads_turnpike_bus_unknown_model30, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -5511,7 +5511,7 @@ Gfx d_course_toads_turnpike_dl_1CE80[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(d_course_toads_turnpike_bus_unknown_model31, 10, 0),
-    gsSP1Quadrangle(0, 1, 2, 2, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 2, 0),
     gsSP2Triangles(0, 2, 3, 0, 4, 5, 0, 0),
     gsSP2Triangles(4, 0, 3, 0, 6, 7, 8, 0),
     gsSP1Triangle(6, 8, 9, 0),
@@ -5885,10 +5885,10 @@ Gfx d_course_toads_turnpike_dl_1E288[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_toads_turnpike_tanker_truck_model_lod0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5907,10 +5907,10 @@ Gfx d_course_toads_turnpike_dl_1E318[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_toads_turnpike_tanker_truck_unknown_model1, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5929,10 +5929,10 @@ Gfx d_course_toads_turnpike_dl_1E3A8[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_toads_turnpike_tanker_truck_unknown_model2, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5965,11 +5965,11 @@ Gfx d_course_toads_turnpike_dl_1E468[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_toads_turnpike_tanker_truck_unknown_model3, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 7, 9, 10, 0),
-    gsSP1Quadrangle(11, 12, 13, 14, 0),
-    gsSP1Quadrangle(13, 15, 16, 17, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 7, 9, 0, 8, 9, 10, 0),
+    gsSP2Triangles(11, 12, 13, 0, 11, 13, 14, 0),
+    gsSP2Triangles(13, 15, 16, 0, 13, 16, 17, 0),
     gsSP2Triangles(10, 9, 18, 0, 12, 11, 19, 0),
     gsSPEndDisplayList(),
 };
@@ -5990,11 +5990,11 @@ Gfx d_course_toads_turnpike_dl_1E508[] =
     gsSPClearGeometryMode(G_LIGHTING),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPVertex(d_course_toads_turnpike_tanker_truck_unknown_model4, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 15, 12, 14, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -6008,22 +6008,22 @@ Gfx d_course_toads_turnpike_dl_1E508[] =
     gsSP2Triangles(0, 1, 2, 0, 2, 3, 4, 0),
     gsSP2Triangles(4, 3, 5, 0, 6, 7, 5, 0),
     gsSP2Triangles(6, 5, 3, 0, 5, 8, 4, 0),
-    gsSP1Quadrangle(8, 9, 10, 4, 0),
-    gsSP1Quadrangle(0, 11, 12, 1, 0),
-    gsSP1Quadrangle(13, 14, 15, 16, 0),
-    gsSP1Quadrangle(16, 17, 18, 13, 0),
-    gsSP1Quadrangle(17, 19, 20, 18, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 4, 0),
+    gsSP2Triangles(0, 11, 12, 0, 0, 12, 1, 0),
+    gsSP2Triangles(13, 14, 15, 0, 13, 15, 16, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 13, 0),
+    gsSP2Triangles(17, 19, 20, 0, 17, 20, 18, 0),
     gsSP2Triangles(21, 22, 23, 0, 23, 24, 21, 0),
-    gsSP1Quadrangle(23, 25, 26, 24, 0),
+    gsSP2Triangles(23, 25, 26, 0, 23, 26, 24, 0),
     gsSP2Triangles(21, 24, 27, 0, 11, 27, 12, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(d_course_toads_turnpike_tanker_truck_unknown_model6, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_MIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -6034,7 +6034,7 @@ Gfx d_course_toads_turnpike_dl_1E508[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPVertex(d_course_toads_turnpike_tanker_truck_unknown_model7, 18, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 4, 7, 8, 0),
     gsSP2Triangles(4, 8, 5, 0, 9, 10, 11, 0),
     gsSP2Triangles(9, 11, 12, 0, 13, 14, 15, 0),
@@ -6049,29 +6049,29 @@ Gfx d_course_toads_turnpike_dl_1E508[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPVertex(d_course_toads_turnpike_tanker_truck_unknown_model8, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, d_course_toads_turnpike_tanker_truck_stripe),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(d_course_toads_turnpike_tanker_truck_unknown_model9, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(6, 10, 11, 7, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(8, 13, 12, 9, 0),
-    gsSP1Quadrangle(16, 15, 14, 17, 0),
-    gsSP1Quadrangle(18, 19, 16, 17, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(22, 24, 25, 23, 0),
-    gsSP1Quadrangle(20, 26, 27, 21, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(6, 10, 11, 0, 6, 11, 7, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(8, 13, 12, 0, 8, 12, 9, 0),
+    gsSP2Triangles(16, 15, 14, 0, 16, 14, 17, 0),
+    gsSP2Triangles(18, 19, 16, 0, 18, 16, 17, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(22, 24, 25, 0, 22, 25, 23, 0),
+    gsSP2Triangles(20, 26, 27, 0, 20, 27, 21, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(d_course_toads_turnpike_tanker_truck_unknown_model10, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6090,10 +6090,10 @@ Gfx d_course_toads_turnpike_dl_1E810[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_toads_turnpike_tanker_truck_unknown_model11, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 4, 5, 0, 0),
-    gsSP1Quadrangle(4, 6, 7, 5, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 4, 5, 0, 3, 5, 0, 0),
+    gsSP2Triangles(4, 6, 7, 0, 4, 7, 5, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6112,18 +6112,18 @@ Gfx d_course_toads_turnpike_dl_1E8A0[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_toads_turnpike_tanker_truck_unknown_model12, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 1, 0, 0),
-    gsSP1Quadrangle(3, 2, 6, 7, 0),
-    gsSP1Quadrangle(7, 6, 8, 9, 0),
-    gsSP1Quadrangle(9, 8, 10, 11, 0),
-    gsSP1Quadrangle(11, 10, 5, 4, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(15, 14, 16, 17, 0),
-    gsSP1Quadrangle(17, 16, 18, 19, 0),
-    gsSP1Quadrangle(19, 18, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 13, 12, 0),
-    gsSP1Quadrangle(21, 20, 23, 22, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0),
+    gsSP2Triangles(3, 2, 6, 0, 3, 6, 7, 0),
+    gsSP2Triangles(7, 6, 8, 0, 7, 8, 9, 0),
+    gsSP2Triangles(9, 8, 10, 0, 9, 10, 11, 0),
+    gsSP2Triangles(11, 10, 5, 0, 11, 5, 4, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(15, 14, 16, 0, 15, 16, 17, 0),
+    gsSP2Triangles(17, 16, 18, 0, 17, 18, 19, 0),
+    gsSP2Triangles(19, 18, 20, 0, 19, 20, 21, 0),
+    gsSP2Triangles(22, 23, 13, 0, 22, 13, 12, 0),
+    gsSP2Triangles(21, 20, 23, 0, 21, 23, 22, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6142,18 +6142,18 @@ Gfx d_course_toads_turnpike_dl_1E970[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_toads_turnpike_tanker_truck_unknown_model13, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 1, 0, 0),
-    gsSP1Quadrangle(3, 2, 6, 7, 0),
-    gsSP1Quadrangle(7, 6, 8, 9, 0),
-    gsSP1Quadrangle(9, 8, 10, 11, 0),
-    gsSP1Quadrangle(11, 10, 5, 4, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(15, 14, 16, 17, 0),
-    gsSP1Quadrangle(17, 16, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 13, 12, 0),
-    gsSP1Quadrangle(19, 18, 22, 23, 0),
-    gsSP1Quadrangle(23, 22, 21, 20, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0),
+    gsSP2Triangles(3, 2, 6, 0, 3, 6, 7, 0),
+    gsSP2Triangles(7, 6, 8, 0, 7, 8, 9, 0),
+    gsSP2Triangles(9, 8, 10, 0, 9, 10, 11, 0),
+    gsSP2Triangles(11, 10, 5, 0, 11, 5, 4, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(15, 14, 16, 0, 15, 16, 17, 0),
+    gsSP2Triangles(17, 16, 18, 0, 17, 18, 19, 0),
+    gsSP2Triangles(20, 21, 13, 0, 20, 13, 12, 0),
+    gsSP2Triangles(19, 18, 22, 0, 19, 22, 23, 0),
+    gsSP2Triangles(23, 22, 21, 0, 23, 21, 20, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6172,18 +6172,18 @@ Gfx d_course_toads_turnpike_dl_1EA40[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_toads_turnpike_tanker_truck_unknown_model14, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 1, 0, 0),
-    gsSP1Quadrangle(3, 2, 6, 7, 0),
-    gsSP1Quadrangle(7, 6, 8, 9, 0),
-    gsSP1Quadrangle(9, 8, 10, 11, 0),
-    gsSP1Quadrangle(11, 10, 5, 4, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(15, 14, 16, 17, 0),
-    gsSP1Quadrangle(17, 16, 18, 19, 0),
-    gsSP1Quadrangle(19, 18, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 13, 12, 0),
-    gsSP1Quadrangle(21, 20, 23, 22, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0),
+    gsSP2Triangles(3, 2, 6, 0, 3, 6, 7, 0),
+    gsSP2Triangles(7, 6, 8, 0, 7, 8, 9, 0),
+    gsSP2Triangles(9, 8, 10, 0, 9, 10, 11, 0),
+    gsSP2Triangles(11, 10, 5, 0, 11, 5, 4, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(15, 14, 16, 0, 15, 16, 17, 0),
+    gsSP2Triangles(17, 16, 18, 0, 17, 18, 19, 0),
+    gsSP2Triangles(19, 18, 20, 0, 19, 20, 21, 0),
+    gsSP2Triangles(22, 23, 13, 0, 22, 13, 12, 0),
+    gsSP2Triangles(21, 20, 23, 0, 21, 23, 22, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6470,8 +6470,8 @@ Gfx d_course_toads_turnpike_dl_1F7D8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(d_course_toads_turnpike_tanker_truck_model_lod1, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6489,7 +6489,7 @@ Gfx d_course_toads_turnpike_dl_1F850[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(d_course_toads_turnpike_tanker_truck_unknown_model15, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6507,8 +6507,8 @@ Gfx d_course_toads_turnpike_dl_1F8C0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(d_course_toads_turnpike_tanker_truck_unknown_model16, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6526,7 +6526,7 @@ Gfx d_course_toads_turnpike_dl_1F938[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(d_course_toads_turnpike_tanker_truck_unknown_model17, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6562,9 +6562,9 @@ Gfx d_course_toads_turnpike_dl_1F9E0[] =
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPVertex(d_course_toads_turnpike_tanker_truck_unknown_model18, 16, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 11, 8, 10, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -6582,17 +6582,17 @@ Gfx d_course_toads_turnpike_dl_1F9E0[] =
     gsSP2Triangles(9, 11, 12, 0, 13, 14, 15, 0),
     gsSP2Triangles(13, 15, 16, 0, 15, 14, 17, 0),
     gsSP2Triangles(15, 18, 19, 0, 17, 18, 15, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(d_course_toads_turnpike_tanker_truck_unknown_model20, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 1, 0, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 1, 0, 0, 4, 0, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsSP2Triangles(10, 11, 12, 0, 10, 13, 14, 0),
     gsSP2Triangles(10, 14, 11, 0, 13, 15, 14, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_MIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -6605,9 +6605,9 @@ Gfx d_course_toads_turnpike_dl_1F9E0[] =
     gsSPVertex(d_course_toads_turnpike_tanker_truck_unknown_model21, 18, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 4, 0),
     gsSP2Triangles(0, 4, 1, 0, 3, 5, 4, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -6618,29 +6618,29 @@ Gfx d_course_toads_turnpike_dl_1F9E0[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPVertex(d_course_toads_turnpike_tanker_truck_unknown_model22, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, d_course_toads_turnpike_tanker_truck_stripe),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(d_course_toads_turnpike_tanker_truck_unknown_model23, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(0, 4, 5, 1, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(2, 7, 6, 3, 0),
-    gsSP1Quadrangle(10, 9, 8, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(14, 16, 17, 15, 0),
-    gsSP1Quadrangle(18, 19, 10, 11, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(22, 24, 25, 23, 0),
-    gsSP1Quadrangle(18, 26, 27, 19, 0),
-    gsSP1Quadrangle(20, 28, 29, 21, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(0, 4, 5, 0, 0, 5, 1, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(2, 7, 6, 0, 2, 6, 3, 0),
+    gsSP2Triangles(10, 9, 8, 0, 10, 8, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(14, 16, 17, 0, 14, 17, 15, 0),
+    gsSP2Triangles(18, 19, 10, 0, 18, 10, 11, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(22, 24, 25, 0, 22, 25, 23, 0),
+    gsSP2Triangles(18, 26, 27, 0, 18, 27, 19, 0),
+    gsSP2Triangles(20, 28, 29, 0, 20, 29, 21, 0),
     gsSPVertex(d_course_toads_turnpike_tanker_truck_unknown_model24, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6659,8 +6659,8 @@ Gfx d_course_toads_turnpike_dl_1FCD8[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_toads_turnpike_tanker_truck_unknown_model25, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6679,7 +6679,7 @@ Gfx d_course_toads_turnpike_dl_1FD58[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_toads_turnpike_tanker_truck_unknown_model26, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6698,8 +6698,8 @@ Gfx d_course_toads_turnpike_dl_1FDD0[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_toads_turnpike_tanker_truck_unknown_model27, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6718,7 +6718,7 @@ Gfx d_course_toads_turnpike_dl_1FE50[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_toads_turnpike_tanker_truck_unknown_model28, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6737,9 +6737,9 @@ Gfx d_course_toads_turnpike_dl_1FEC8[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_toads_turnpike_tanker_truck_unknown_model29, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6758,7 +6758,7 @@ Gfx d_course_toads_turnpike_dl_1FF50[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_toads_turnpike_tanker_truck_unknown_model30, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6861,13 +6861,13 @@ Gfx d_course_toads_turnpike_dl_20348[] =
     gsSPClearGeometryMode(G_LIGHTING),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPVertex(d_course_toads_turnpike_tanker_truck_model_lod2, 14, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(0, 3, 4, 0, 0, 1, 2, 0),
-    gsSP1Quadrangle(0, 2, 3, 4, 0),
-    gsSP1Quadrangle(3, 5, 6, 4, 0),
-    gsSP1Quadrangle(7, 8, 6, 5, 0),
-    gsSP1Quadrangle(9, 8, 7, 10, 0),
-    gsSP1Quadrangle(9, 10, 11, 12, 0),
+    gsSP2Triangles(0, 2, 3, 0, 0, 3, 4, 0),
+    gsSP2Triangles(3, 5, 6, 0, 3, 6, 4, 0),
+    gsSP2Triangles(7, 8, 6, 0, 7, 6, 5, 0),
+    gsSP2Triangles(9, 8, 7, 0, 9, 7, 10, 0),
+    gsSP2Triangles(9, 10, 11, 0, 9, 11, 12, 0),
     gsSP1Triangle(9, 12, 13, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, d_course_toads_turnpike_tanker_truck_back_lod1),
     gsDPTileSync(),
@@ -6875,10 +6875,10 @@ Gfx d_course_toads_turnpike_dl_20348[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(d_course_toads_turnpike_tanker_truck_unknown_model31, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 0, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 6, 9, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 0, 0, 4, 0, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 6, 0, 10, 6, 9, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6897,13 +6897,13 @@ Gfx d_course_toads_turnpike_dl_20450[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_toads_turnpike_tanker_truck_unknown_model32, 21, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 6, 9, 10, 0),
-    gsSP1Quadrangle(9, 11, 12, 10, 0),
-    gsSP1Quadrangle(11, 13, 14, 12, 0),
-    gsSP1Quadrangle(15, 14, 13, 16, 0),
-    gsSP1Quadrangle(17, 18, 19, 20, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 6, 9, 0, 8, 9, 10, 0),
+    gsSP2Triangles(9, 11, 12, 0, 9, 12, 10, 0),
+    gsSP2Triangles(11, 13, 14, 0, 11, 14, 12, 0),
+    gsSP2Triangles(15, 14, 13, 0, 15, 13, 16, 0),
+    gsSP2Triangles(17, 18, 19, 0, 17, 19, 20, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6935,7 +6935,7 @@ Gfx d_course_toads_turnpike_dl_20520[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_toads_turnpike_tanker_truck_unknown_model33, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7280,10 +7280,10 @@ Gfx d_course_toads_turnpike_dl_21648[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_toads_turnpike_car_model_lod0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7302,10 +7302,10 @@ Gfx d_course_toads_turnpike_dl_216D8[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_toads_turnpike_car_unknown_model1, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7337,10 +7337,10 @@ Gfx d_course_toads_turnpike_dl_21790[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_toads_turnpike_car_unknown_model2, 10, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 6, 0),
-    gsSP1Quadrangle(6, 7, 3, 2, 0),
-    gsSP1Quadrangle(7, 8, 9, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 6, 0),
+    gsSP2Triangles(6, 7, 3, 0, 6, 3, 2, 0),
+    gsSP2Triangles(7, 8, 9, 0, 7, 9, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7359,10 +7359,10 @@ Gfx d_course_toads_turnpike_dl_21820[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_toads_turnpike_car_unknown_model3, 10, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 6, 0),
-    gsSP1Quadrangle(6, 7, 3, 2, 0),
-    gsSP1Quadrangle(7, 8, 9, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 6, 0),
+    gsSP2Triangles(6, 7, 3, 0, 6, 3, 2, 0),
+    gsSP2Triangles(7, 8, 9, 0, 7, 9, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7381,12 +7381,12 @@ Gfx d_course_toads_turnpike_dl_218B0[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_toads_turnpike_car_unknown_model4, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7406,8 +7406,8 @@ Gfx d_course_toads_turnpike_dl_21950[] =
     gsSPClearGeometryMode(G_LIGHTING),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPVertex(d_course_toads_turnpike_car_unknown_model5, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -7417,7 +7417,7 @@ Gfx d_course_toads_turnpike_dl_21950[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(d_course_toads_turnpike_car_unknown_model6, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7452,13 +7452,13 @@ Gfx d_course_toads_turnpike_dl_21A28[] =
     gsSPVertex(d_course_toads_turnpike_car_unknown_model8, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 2, 4, 0),
     gsSP2Triangles(5, 6, 7, 0, 8, 9, 10, 0),
-    gsSP1Quadrangle(8, 11, 12, 9, 0),
-    gsSP1Quadrangle(13, 14, 11, 8, 0),
+    gsSP2Triangles(8, 11, 12, 0, 8, 12, 9, 0),
+    gsSP2Triangles(13, 14, 11, 0, 13, 11, 8, 0),
     gsSP2Triangles(15, 10, 16, 0, 17, 18, 16, 0),
     gsSP2Triangles(17, 16, 10, 0, 11, 19, 12, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(23, 24, 25, 20, 0),
-    gsSP1Quadrangle(24, 26, 27, 25, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(23, 24, 25, 0, 23, 25, 20, 0),
+    gsSP2Triangles(24, 26, 27, 0, 24, 27, 25, 0),
     gsSP2Triangles(28, 19, 29, 0, 30, 19, 31, 0),
     gsSPVertex(d_course_toads_turnpike_car_unknown_model9, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
@@ -7493,9 +7493,9 @@ Gfx d_course_toads_turnpike_dl_21A28[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(d_course_toads_turnpike_car_unknown_model11, 10, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(7, 6, 8, 9, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(7, 6, 8, 0, 7, 8, 9, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7505,12 +7505,12 @@ Gfx d_course_toads_turnpike_dl_21C78[] =
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_toads_turnpike_car_unknown_model12, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 1, 0, 0),
-    gsSP1Quadrangle(3, 2, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 5, 4, 0),
-    gsSP1Quadrangle(10, 11, 9, 8, 0),
-    gsSP1Quadrangle(7, 6, 11, 10, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0),
+    gsSP2Triangles(3, 2, 6, 0, 3, 6, 7, 0),
+    gsSP2Triangles(8, 9, 5, 0, 8, 5, 4, 0),
+    gsSP2Triangles(10, 11, 9, 0, 10, 9, 8, 0),
+    gsSP2Triangles(7, 6, 11, 0, 7, 11, 10, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7520,12 +7520,12 @@ Gfx d_course_toads_turnpike_dl_21CD0[] =
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_toads_turnpike_car_unknown_model13, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 1, 0, 0),
-    gsSP1Quadrangle(3, 2, 6, 7, 0),
-    gsSP1Quadrangle(7, 6, 8, 9, 0),
-    gsSP1Quadrangle(9, 8, 10, 11, 0),
-    gsSP1Quadrangle(11, 10, 5, 4, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0),
+    gsSP2Triangles(3, 2, 6, 0, 3, 6, 7, 0),
+    gsSP2Triangles(7, 6, 8, 0, 7, 8, 9, 0),
+    gsSP2Triangles(9, 8, 10, 0, 9, 10, 11, 0),
+    gsSP2Triangles(11, 10, 5, 0, 11, 5, 4, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7535,12 +7535,12 @@ Gfx d_course_toads_turnpike_dl_21D28[] =
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_toads_turnpike_car_unknown_model14, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 1, 0, 0),
-    gsSP1Quadrangle(3, 2, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 5, 4, 0),
-    gsSP1Quadrangle(10, 11, 9, 8, 0),
-    gsSP1Quadrangle(7, 6, 11, 10, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0),
+    gsSP2Triangles(3, 2, 6, 0, 3, 6, 7, 0),
+    gsSP2Triangles(8, 9, 5, 0, 8, 5, 4, 0),
+    gsSP2Triangles(10, 11, 9, 0, 10, 9, 8, 0),
+    gsSP2Triangles(7, 6, 11, 0, 7, 11, 10, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7550,12 +7550,12 @@ Gfx d_course_toads_turnpike_dl_21D80[] =
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_toads_turnpike_car_unknown_model15, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 1, 0, 0),
-    gsSP1Quadrangle(3, 2, 6, 7, 0),
-    gsSP1Quadrangle(7, 6, 8, 9, 0),
-    gsSP1Quadrangle(9, 8, 10, 11, 0),
-    gsSP1Quadrangle(11, 10, 5, 4, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0),
+    gsSP2Triangles(3, 2, 6, 0, 3, 6, 7, 0),
+    gsSP2Triangles(7, 6, 8, 0, 7, 8, 9, 0),
+    gsSP2Triangles(9, 8, 10, 0, 9, 10, 11, 0),
+    gsSP2Triangles(11, 10, 5, 0, 11, 5, 4, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7826,10 +7826,10 @@ Gfx d_course_toads_turnpike_dl_22A68[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_toads_turnpike_car_model_lod1, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7848,10 +7848,10 @@ Gfx d_course_toads_turnpike_dl_22AF8[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_toads_turnpike_car_unknown_model16, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7883,12 +7883,12 @@ Gfx d_course_toads_turnpike_dl_22BB0[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_toads_turnpike_car_unknown_model17, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
-    gsSP1Quadrangle(3, 6, 7, 0, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(9, 12, 13, 10, 0),
-    gsSP1Quadrangle(11, 14, 15, 8, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
+    gsSP2Triangles(3, 6, 7, 0, 3, 7, 0, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(9, 12, 13, 0, 9, 13, 10, 0),
+    gsSP2Triangles(11, 14, 15, 0, 11, 15, 8, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7898,8 +7898,8 @@ Gfx d_course_toads_turnpike_dl_22C50[] =
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_toads_turnpike_car_unknown_model18, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7909,8 +7909,8 @@ Gfx d_course_toads_turnpike_dl_22C88[] =
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_toads_turnpike_car_unknown_model19, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7929,12 +7929,12 @@ Gfx d_course_toads_turnpike_dl_22CC0[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_toads_turnpike_car_unknown_model20, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7954,8 +7954,8 @@ Gfx d_course_toads_turnpike_dl_22D60[] =
     gsSPClearGeometryMode(G_LIGHTING),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPVertex(d_course_toads_turnpike_car_unknown_model21, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -7965,7 +7965,7 @@ Gfx d_course_toads_turnpike_dl_22D60[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(d_course_toads_turnpike_car_unknown_model22, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7989,10 +7989,10 @@ Gfx d_course_toads_turnpike_dl_22E38[] =
     gsSP2Triangles(2, 3, 4, 0, 3, 1, 5, 0),
     gsSP2Triangles(3, 5, 6, 0, 5, 1, 0, 0),
     gsSP2Triangles(5, 0, 7, 0, 4, 3, 8, 0),
-    gsSP1Quadrangle(8, 3, 6, 9, 0),
-    gsSP1Quadrangle(10, 11, 4, 8, 0),
+    gsSP2Triangles(8, 3, 6, 0, 8, 6, 9, 0),
+    gsSP2Triangles(10, 11, 4, 0, 10, 4, 8, 0),
     gsSP2Triangles(12, 13, 14, 0, 13, 12, 15, 0),
-    gsSP1Quadrangle(14, 13, 16, 17, 0),
+    gsSP2Triangles(14, 13, 16, 0, 14, 16, 17, 0),
     gsSP2Triangles(13, 15, 18, 0, 18, 11, 16, 0),
     gsSP2Triangles(18, 16, 13, 0, 19, 15, 12, 0),
     gsSP2Triangles(15, 19, 20, 0, 0, 2, 18, 0),
@@ -8001,11 +8001,11 @@ Gfx d_course_toads_turnpike_dl_22E38[] =
     gsSP2Triangles(10, 23, 16, 0, 24, 23, 10, 0),
     gsSP2Triangles(25, 24, 10, 0, 26, 25, 10, 0),
     gsSP2Triangles(26, 10, 27, 0, 17, 16, 23, 0),
-    gsSP1Quadrangle(28, 29, 25, 26, 0),
+    gsSP2Triangles(28, 29, 25, 0, 28, 25, 26, 0),
     gsSP1Triangle(27, 30, 26, 0),
     gsSPVertex(d_course_toads_turnpike_car_unknown_model24, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 11, 9, 8, 0),
     gsSP2Triangles(9, 12, 10, 0, 13, 14, 12, 0),
     gsSP2Triangles(13, 12, 15, 0, 14, 10, 12, 0),
@@ -8013,16 +8013,16 @@ Gfx d_course_toads_turnpike_dl_22E38[] =
     gsSP2Triangles(17, 15, 18, 0, 15, 17, 13, 0),
     gsSP2Triangles(19, 18, 20, 0, 21, 22, 23, 0),
     gsSP2Triangles(21, 23, 24, 0, 25, 22, 21, 0),
-    gsSP1Quadrangle(21, 26, 17, 25, 0),
-    gsSP1Quadrangle(27, 24, 28, 10, 0),
+    gsSP2Triangles(21, 26, 17, 0, 21, 17, 25, 0),
+    gsSP2Triangles(27, 24, 28, 0, 27, 28, 10, 0),
     gsSP2Triangles(24, 23, 28, 0, 29, 30, 16, 0),
     gsSP1Triangle(29, 16, 31, 0),
     gsSPVertex(d_course_toads_turnpike_car_unknown_model25, 22, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(3, 5, 6, 0, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -8032,9 +8032,9 @@ Gfx d_course_toads_turnpike_dl_22E38[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(d_course_toads_turnpike_car_unknown_model26, 10, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsSPEndDisplayList(),
 };
 
@@ -8168,16 +8168,16 @@ Gfx d_course_toads_turnpike_dl_23538[] =
     gsSPClearGeometryMode(G_LIGHTING),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPVertex(d_course_toads_turnpike_car_model_lod2, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, d_course_toads_turnpike_car_side_lod1),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(d_course_toads_turnpike_car_unknown_model27, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -8196,7 +8196,7 @@ Gfx d_course_toads_turnpike_dl_23600[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_toads_turnpike_car_unknown_model28, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -8216,10 +8216,10 @@ Gfx d_course_toads_turnpike_dl_23678[] =
     gsSPClearGeometryMode(G_LIGHTING),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPVertex(d_course_toads_turnpike_car_unknown_model29, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, d_course_toads_turnpike_car_back_lod1),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
@@ -8227,23 +8227,23 @@ Gfx d_course_toads_turnpike_dl_23678[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPVertex(d_course_toads_turnpike_car_unknown_model30, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, d_course_toads_turnpike_car_side_lod1),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(d_course_toads_turnpike_car_unknown_model31, 27, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 5, 7, 6, 0),
-    gsSP1Quadrangle(8, 7, 9, 10, 0),
-    gsSP1Quadrangle(11, 12, 13, 9, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(12, 4, 8, 10, 0),
+    gsSP2Triangles(8, 7, 9, 0, 8, 9, 10, 0),
+    gsSP2Triangles(11, 12, 13, 0, 11, 13, 9, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(12, 4, 8, 0, 12, 8, 10, 0),
     gsSP2Triangles(18, 19, 20, 0, 19, 21, 22, 0),
     gsSP2Triangles(19, 22, 23, 0, 22, 21, 24, 0),
-    gsSP1Quadrangle(22, 25, 26, 23, 0),
+    gsSP2Triangles(22, 25, 26, 0, 22, 26, 23, 0),
     gsSP2Triangles(25, 22, 24, 0, 26, 18, 20, 0),
     gsSPEndDisplayList(),
 };
diff --git a/courses/flower_cup/toads_turnpike/packed.inc.c b/courses/flower_cup/toads_turnpike/packed.inc.c
index ffe81cfdf..5fa8d4c3e 100644
--- a/courses/flower_cup/toads_turnpike/packed.inc.c
+++ b/courses/flower_cup/toads_turnpike/packed.inc.c
@@ -17,8 +17,8 @@ Gfx d_course_toads_turnpike_packed_dl_0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000000, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -34,9 +34,9 @@ Gfx d_course_toads_turnpike_packed_dl_68[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000080, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -52,8 +52,8 @@ Gfx d_course_toads_turnpike_packed_dl_D8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000140, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -69,26 +69,26 @@ Gfx d_course_toads_turnpike_packed_dl_160[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x040001C0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x040003C0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x040005C0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -96,32 +96,32 @@ Gfx d_course_toads_turnpike_packed_dl_218[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04000640, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04000840, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04000A40, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -129,32 +129,32 @@ Gfx d_course_toads_turnpike_packed_dl_300[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04000C40, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04000E40, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04001040, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -162,30 +162,30 @@ Gfx d_course_toads_turnpike_packed_dl_3E8[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04001240, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04001440, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04001640, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -193,19 +193,19 @@ Gfx d_course_toads_turnpike_packed_dl_4C0[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x040017C0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x040019C0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -213,30 +213,30 @@ Gfx d_course_toads_turnpike_packed_dl_540[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04001AC0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04001CC0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04001EC0, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -244,29 +244,29 @@ Gfx d_course_toads_turnpike_packed_dl_618[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04002040, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(6, 8, 9, 7, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(25, 24, 26, 27, 0),
-    gsSP1Quadrangle(8, 28, 29, 9, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(6, 8, 9, 0, 6, 9, 7, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(25, 24, 26, 0, 25, 26, 27, 0),
+    gsSP2Triangles(8, 28, 29, 0, 8, 29, 9, 0),
     gsSPVertex(0x04002220, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPVertex(0x04002400, 14, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(7, 6, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(7, 6, 8, 0, 7, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
     gsSPEndDisplayList(),
 };
 
@@ -274,19 +274,19 @@ Gfx d_course_toads_turnpike_packed_dl_6E8[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x040024E0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x040026E0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -294,19 +294,19 @@ Gfx d_course_toads_turnpike_packed_dl_768[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x040027E0, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(27, 26, 28, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(27, 26, 28, 0, 27, 28, 29, 0),
     gsSPVertex(0x040029C0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -314,30 +314,30 @@ Gfx d_course_toads_turnpike_packed_dl_7E8[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04002AC0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04002CC0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04002EC0, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -345,19 +345,19 @@ Gfx d_course_toads_turnpike_packed_dl_8C0[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04003040, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04003240, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -365,32 +365,32 @@ Gfx d_course_toads_turnpike_packed_dl_940[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04003340, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04003540, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04003740, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -398,19 +398,19 @@ Gfx d_course_toads_turnpike_packed_dl_A28[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04003940, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04003B40, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -418,23 +418,23 @@ Gfx d_course_toads_turnpike_packed_dl_AA8[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04003C40, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04003E40, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -442,32 +442,32 @@ Gfx d_course_toads_turnpike_packed_dl_B48[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04004040, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04004240, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04004440, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -475,30 +475,30 @@ Gfx d_course_toads_turnpike_packed_dl_C30[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04004640, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04004840, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04004A40, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -506,19 +506,19 @@ Gfx d_course_toads_turnpike_packed_dl_D08[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04004BC0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04004DC0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -526,19 +526,19 @@ Gfx d_course_toads_turnpike_packed_dl_D88[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04004EC0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x040050C0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -546,26 +546,26 @@ Gfx d_course_toads_turnpike_packed_dl_E08[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x040051C0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x040053C0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x040055C0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -573,32 +573,32 @@ Gfx d_course_toads_turnpike_packed_dl_EC0[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04005640, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04005840, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04005A40, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -652,22 +652,22 @@ Gfx d_course_toads_turnpike_packed_dl_1078[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04005C40, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(9, 10, 11, 6, 0),
-    gsSP1Quadrangle(6, 11, 12, 13, 0),
-    gsSP1Quadrangle(13, 14, 7, 6, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(9, 10, 11, 0, 9, 11, 6, 0),
+    gsSP2Triangles(6, 11, 12, 0, 6, 12, 13, 0),
+    gsSP2Triangles(13, 14, 7, 0, 13, 7, 6, 0),
     gsSP2Triangles(15, 16, 17, 0, 18, 19, 20, 0),
     gsSP2Triangles(21, 22, 23, 0, 24, 25, 26, 0),
     gsSP1Triangle(27, 28, 29, 0),
     gsSPVertex(0x04005E20, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(9, 8, 10, 11, 0),
-    gsSP1Quadrangle(11, 12, 13, 9, 0),
-    gsSP1Quadrangle(9, 13, 14, 6, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(9, 8, 10, 0, 9, 10, 11, 0),
+    gsSP2Triangles(11, 12, 13, 0, 11, 13, 9, 0),
+    gsSP2Triangles(9, 13, 14, 0, 9, 14, 6, 0),
     gsSP2Triangles(15, 16, 17, 0, 18, 19, 20, 0),
     gsSP2Triangles(21, 22, 23, 0, 24, 25, 26, 0),
     gsSP1Triangle(27, 28, 29, 0),
@@ -701,20 +701,20 @@ Gfx d_course_toads_turnpike_packed_dl_11B8[] =
     gsSP2Triangles(9, 11, 12, 0, 13, 14, 10, 0),
     gsSP2Triangles(13, 10, 9, 0, 12, 15, 16, 0),
     gsSP2Triangles(12, 16, 9, 0, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(23, 24, 25, 20, 0),
-    gsSP1Quadrangle(20, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(23, 24, 25, 0, 23, 25, 20, 0),
+    gsSP2Triangles(20, 25, 26, 0, 20, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x040062A0, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 11, 12, 13, 0),
     gsSP2Triangles(11, 13, 14, 0, 15, 16, 17, 0),
     gsSP2Triangles(18, 19, 20, 0, 21, 22, 23, 0),
     gsSP2Triangles(24, 25, 26, 0, 27, 28, 29, 0),
     gsSPVertex(0x04006480, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
     gsSP2Triangles(6, 7, 8, 0, 9, 10, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 15, 16, 17, 0),
     gsSP2Triangles(15, 17, 18, 0, 19, 20, 16, 0),
@@ -746,8 +746,8 @@ Gfx d_course_toads_turnpike_packed_dl_11B8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x040067B0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -773,11 +773,11 @@ Gfx d_course_toads_turnpike_packed_dl_13B0[] =
     gsSP2Triangles(18, 23, 15, 0, 24, 25, 26, 0),
     gsSP1Triangle(27, 28, 29, 0),
     gsSPVertex(0x04006A10, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 1, 0, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(9, 8, 10, 11, 0),
-    gsSP1Quadrangle(11, 12, 13, 9, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(9, 8, 10, 0, 9, 10, 11, 0),
+    gsSP2Triangles(11, 12, 13, 0, 11, 13, 9, 0),
     gsSP2Triangles(14, 15, 16, 0, 9, 13, 17, 0),
     gsSP2Triangles(9, 17, 6, 0, 18, 19, 20, 0),
     gsSP2Triangles(18, 20, 21, 0, 21, 22, 23, 0),
@@ -803,7 +803,7 @@ Gfx d_course_toads_turnpike_packed_dl_13B0[] =
     gsSP2Triangles(9, 7, 6, 0, 8, 9, 6, 0),
     gsSP2Triangles(10, 11, 12, 0, 13, 10, 12, 0),
     gsSP2Triangles(14, 12, 11, 0, 14, 13, 12, 0),
-    gsSP1Quadrangle(15, 16, 17, 18, 0),
+    gsSP2Triangles(15, 16, 17, 0, 15, 17, 18, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 6, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x007C),
@@ -813,16 +813,16 @@ Gfx d_course_toads_turnpike_packed_dl_13B0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04006F00, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05004000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04006F80, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -838,9 +838,9 @@ Gfx d_course_toads_turnpike_packed_dl_15E8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04007000, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 4, 5, 0, 0),
-    gsSP1Quadrangle(3, 2, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 4, 5, 0, 3, 5, 0, 0),
+    gsSP2Triangles(3, 2, 6, 0, 3, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 11, 12, 13, 0),
     gsSP2Triangles(14, 15, 16, 0, 17, 18, 19, 0),
     gsSP2Triangles(20, 21, 22, 0, 23, 24, 25, 0),
@@ -850,8 +850,8 @@ Gfx d_course_toads_turnpike_packed_dl_15E8[] =
     gsSPVertex(0x040071E0, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(6, 7, 8, 0, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(15, 14, 16, 17, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(15, 14, 16, 0, 15, 16, 17, 0),
     gsSP2Triangles(18, 19, 20, 0, 21, 22, 23, 0),
     gsSP2Triangles(24, 25, 26, 0, 27, 28, 29, 0),
     gsSP2Triangles(27, 29, 30, 0, 30, 29, 31, 0),
@@ -876,7 +876,7 @@ Gfx d_course_toads_turnpike_packed_dl_15E8[] =
     gsSP2Triangles(4, 2, 1, 0, 4, 3, 2, 0),
     gsSP2Triangles(5, 6, 7, 0, 5, 8, 6, 0),
     gsSP2Triangles(8, 9, 6, 0, 9, 7, 6, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
     gsSP2Triangles(11, 14, 12, 0, 14, 13, 12, 0),
     gsSPEndDisplayList(),
 };
@@ -893,22 +893,22 @@ Gfx d_course_toads_turnpike_packed_dl_1780[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040076B0, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(9, 10, 11, 6, 0),
-    gsSP1Quadrangle(6, 11, 12, 13, 0),
-    gsSP1Quadrangle(13, 14, 7, 6, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(9, 10, 11, 0, 9, 11, 6, 0),
+    gsSP2Triangles(6, 11, 12, 0, 6, 12, 13, 0),
+    gsSP2Triangles(13, 14, 7, 0, 13, 7, 6, 0),
     gsSP2Triangles(15, 16, 17, 0, 18, 19, 20, 0),
     gsSP2Triangles(21, 22, 23, 0, 24, 25, 26, 0),
     gsSP1Triangle(27, 28, 29, 0),
     gsSPVertex(0x04007890, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(9, 8, 10, 11, 0),
-    gsSP1Quadrangle(11, 12, 13, 9, 0),
-    gsSP1Quadrangle(9, 13, 14, 6, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(9, 8, 10, 0, 9, 10, 11, 0),
+    gsSP2Triangles(11, 12, 13, 0, 11, 13, 9, 0),
+    gsSP2Triangles(9, 13, 14, 0, 9, 14, 6, 0),
     gsSP2Triangles(15, 16, 17, 0, 18, 19, 20, 0),
     gsSP2Triangles(21, 22, 23, 0, 24, 25, 26, 0),
     gsSP1Triangle(27, 28, 29, 0),
@@ -937,9 +937,9 @@ Gfx d_course_toads_turnpike_packed_dl_18C0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04007B10, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 4, 5, 0, 0),
-    gsSP1Quadrangle(3, 2, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 4, 5, 0, 3, 5, 0, 0),
+    gsSP2Triangles(3, 2, 6, 0, 3, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 11, 12, 13, 0),
     gsSP2Triangles(14, 15, 16, 0, 17, 18, 19, 0),
     gsSP2Triangles(20, 21, 22, 0, 23, 24, 25, 0),
@@ -949,8 +949,8 @@ Gfx d_course_toads_turnpike_packed_dl_18C0[] =
     gsSPVertex(0x04007CF0, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(6, 7, 8, 0, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(15, 14, 16, 17, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(15, 14, 16, 0, 15, 16, 17, 0),
     gsSP2Triangles(18, 19, 20, 0, 21, 22, 23, 0),
     gsSP2Triangles(24, 25, 26, 0, 27, 28, 29, 0),
     gsSP2Triangles(27, 29, 30, 0, 30, 29, 31, 0),
@@ -975,7 +975,7 @@ Gfx d_course_toads_turnpike_packed_dl_18C0[] =
     gsSP2Triangles(4, 2, 1, 0, 4, 3, 2, 0),
     gsSP2Triangles(5, 6, 7, 0, 5, 8, 6, 0),
     gsSP2Triangles(8, 9, 6, 0, 9, 7, 6, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
     gsSP2Triangles(11, 14, 12, 0, 14, 13, 12, 0),
     gsSPEndDisplayList(),
 };
@@ -999,18 +999,18 @@ Gfx d_course_toads_turnpike_packed_dl_1A58[] =
     gsSP2Triangles(11, 13, 14, 0, 14, 13, 15, 0),
     gsSP2Triangles(14, 15, 16, 0, 6, 10, 17, 0),
     gsSP2Triangles(6, 17, 3, 0, 18, 19, 20, 0),
-    gsSP1Quadrangle(21, 22, 23, 24, 0),
-    gsSP1Quadrangle(25, 24, 23, 26, 0),
-    gsSP1Quadrangle(25, 26, 27, 28, 0),
+    gsSP2Triangles(21, 22, 23, 0, 21, 23, 24, 0),
+    gsSP2Triangles(25, 24, 23, 0, 25, 23, 26, 0),
+    gsSP2Triangles(25, 26, 27, 0, 25, 27, 28, 0),
     gsSP1Triangle(29, 30, 31, 0),
     gsSPVertex(0x040083C0, 30, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(9, 8, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 13, 12, 0),
-    gsSP1Quadrangle(15, 18, 19, 12, 0),
-    gsSP1Quadrangle(12, 19, 20, 16, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(9, 8, 10, 0, 9, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 13, 0, 16, 13, 12, 0),
+    gsSP2Triangles(15, 18, 19, 0, 15, 19, 12, 0),
+    gsSP2Triangles(12, 19, 20, 0, 12, 20, 16, 0),
     gsSP2Triangles(21, 22, 23, 0, 24, 25, 26, 0),
     gsSP1Triangle(27, 28, 29, 0),
     gsSPVertex(0x040085A0, 6, 0),
@@ -1043,12 +1043,12 @@ Gfx d_course_toads_turnpike_packed_dl_1BB8[] =
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(6, 7, 8, 0, 9, 10, 11, 0),
     gsSP2Triangles(9, 11, 12, 0, 13, 12, 11, 0),
-    gsSP1Quadrangle(13, 11, 14, 15, 0),
+    gsSP2Triangles(13, 11, 14, 0, 13, 14, 15, 0),
     gsSP2Triangles(13, 15, 16, 0, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 21, 20, 0),
-    gsSP1Quadrangle(23, 26, 27, 20, 0),
-    gsSP1Quadrangle(20, 27, 28, 24, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 21, 0, 24, 21, 20, 0),
+    gsSP2Triangles(23, 26, 27, 0, 23, 27, 20, 0),
+    gsSP2Triangles(20, 27, 28, 0, 20, 28, 24, 0),
     gsSP1Triangle(29, 30, 31, 0),
     gsSPVertex(0x040088A0, 8, 0),
     gsSP2Triangles(0, 1, 2, 0, 2, 1, 3, 0),
@@ -1083,9 +1083,9 @@ Gfx d_course_toads_turnpike_packed_dl_1CB8[] =
     gsSP2Triangles(12, 14, 9, 0, 9, 14, 15, 0),
     gsSP2Triangles(9, 15, 16, 0, 16, 17, 10, 0),
     gsSP2Triangles(16, 10, 9, 0, 18, 19, 20, 0),
-    gsSP1Quadrangle(21, 22, 23, 24, 0),
-    gsSP1Quadrangle(25, 24, 23, 26, 0),
-    gsSP1Quadrangle(25, 26, 27, 28, 0),
+    gsSP2Triangles(21, 22, 23, 0, 21, 23, 24, 0),
+    gsSP2Triangles(25, 24, 23, 0, 25, 23, 26, 0),
+    gsSP2Triangles(25, 26, 27, 0, 25, 27, 28, 0),
     gsSP1Triangle(29, 30, 31, 0),
     gsSPVertex(0x04008B70, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
@@ -1127,22 +1127,22 @@ Gfx d_course_toads_turnpike_packed_dl_1E30[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04008ED0, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(9, 10, 11, 6, 0),
-    gsSP1Quadrangle(6, 11, 12, 13, 0),
-    gsSP1Quadrangle(13, 14, 7, 6, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(9, 10, 11, 0, 9, 11, 6, 0),
+    gsSP2Triangles(6, 11, 12, 0, 6, 12, 13, 0),
+    gsSP2Triangles(13, 14, 7, 0, 13, 7, 6, 0),
     gsSP2Triangles(15, 16, 17, 0, 18, 19, 20, 0),
     gsSP2Triangles(21, 22, 23, 0, 24, 25, 26, 0),
     gsSP1Triangle(27, 28, 29, 0),
     gsSPVertex(0x040090B0, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(9, 8, 10, 11, 0),
-    gsSP1Quadrangle(11, 12, 13, 9, 0),
-    gsSP1Quadrangle(9, 13, 14, 6, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(9, 8, 10, 0, 9, 10, 11, 0),
+    gsSP2Triangles(11, 12, 13, 0, 11, 13, 9, 0),
+    gsSP2Triangles(9, 13, 14, 0, 9, 14, 6, 0),
     gsSP2Triangles(15, 16, 17, 0, 18, 19, 20, 0),
     gsSP2Triangles(21, 22, 23, 0, 24, 25, 26, 0),
     gsSP1Triangle(27, 28, 29, 0),
@@ -1154,7 +1154,7 @@ Gfx d_course_toads_turnpike_packed_dl_1E30[] =
     gsSPVertex(0x04009290, 10, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
     gsSP2Triangles(3, 4, 1, 0, 4, 2, 1, 0),
-    gsSP1Quadrangle(5, 6, 7, 8, 0),
+    gsSP2Triangles(5, 6, 7, 0, 5, 7, 8, 0),
     gsSP2Triangles(6, 9, 7, 0, 9, 8, 7, 0),
     gsSPEndDisplayList(),
 };
@@ -1171,8 +1171,8 @@ Gfx d_course_toads_turnpike_packed_dl_1F70[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04009330, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
     gsSP2Triangles(6, 7, 8, 0, 9, 10, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 15, 16, 17, 0),
     gsSP2Triangles(18, 19, 20, 0, 21, 22, 23, 0),
@@ -1203,9 +1203,9 @@ Gfx d_course_toads_turnpike_packed_dl_2050[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04009560, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 4, 5, 0, 0),
-    gsSP1Quadrangle(3, 2, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 4, 5, 0, 3, 5, 0, 0),
+    gsSP2Triangles(3, 2, 6, 0, 3, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 11, 12, 13, 0),
     gsSP2Triangles(14, 15, 16, 0, 17, 18, 19, 0),
     gsSP2Triangles(20, 21, 22, 0, 23, 24, 25, 0),
@@ -1215,8 +1215,8 @@ Gfx d_course_toads_turnpike_packed_dl_2050[] =
     gsSPVertex(0x04009740, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(6, 7, 8, 0, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(15, 14, 16, 17, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(15, 14, 16, 0, 15, 16, 17, 0),
     gsSP2Triangles(18, 19, 20, 0, 21, 22, 23, 0),
     gsSP2Triangles(24, 25, 26, 0, 27, 28, 29, 0),
     gsSP2Triangles(27, 29, 30, 0, 30, 29, 31, 0),
@@ -1241,7 +1241,7 @@ Gfx d_course_toads_turnpike_packed_dl_2050[] =
     gsSP2Triangles(4, 2, 1, 0, 4, 3, 2, 0),
     gsSP2Triangles(5, 6, 7, 0, 5, 8, 6, 0),
     gsSP2Triangles(8, 9, 6, 0, 9, 7, 6, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
     gsSP2Triangles(11, 14, 12, 0, 14, 13, 12, 0),
     gsSPEndDisplayList(),
 };
@@ -1258,22 +1258,22 @@ Gfx d_course_toads_turnpike_packed_dl_21E8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04009C10, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(9, 10, 11, 6, 0),
-    gsSP1Quadrangle(6, 11, 12, 13, 0),
-    gsSP1Quadrangle(13, 14, 7, 6, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(9, 10, 11, 0, 9, 11, 6, 0),
+    gsSP2Triangles(6, 11, 12, 0, 6, 12, 13, 0),
+    gsSP2Triangles(13, 14, 7, 0, 13, 7, 6, 0),
     gsSP2Triangles(15, 16, 17, 0, 18, 19, 20, 0),
     gsSP2Triangles(21, 22, 23, 0, 24, 25, 26, 0),
     gsSP1Triangle(27, 28, 29, 0),
     gsSPVertex(0x04009DF0, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(9, 8, 10, 11, 0),
-    gsSP1Quadrangle(11, 12, 13, 9, 0),
-    gsSP1Quadrangle(9, 13, 14, 6, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(9, 8, 10, 0, 9, 10, 11, 0),
+    gsSP2Triangles(11, 12, 13, 0, 11, 13, 9, 0),
+    gsSP2Triangles(9, 13, 14, 0, 9, 14, 6, 0),
     gsSP2Triangles(15, 16, 17, 0, 18, 19, 20, 0),
     gsSP2Triangles(21, 22, 23, 0, 24, 25, 26, 0),
     gsSP1Triangle(27, 28, 29, 0),
@@ -1302,8 +1302,8 @@ Gfx d_course_toads_turnpike_packed_dl_2328[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x0400A070, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -1313,22 +1313,22 @@ Gfx d_course_toads_turnpike_packed_dl_2328[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400A0F0, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(9, 10, 11, 6, 0),
-    gsSP1Quadrangle(6, 11, 12, 13, 0),
-    gsSP1Quadrangle(13, 14, 7, 6, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(9, 10, 11, 0, 9, 11, 6, 0),
+    gsSP2Triangles(6, 11, 12, 0, 6, 12, 13, 0),
+    gsSP2Triangles(13, 14, 7, 0, 13, 7, 6, 0),
     gsSP2Triangles(15, 16, 17, 0, 18, 19, 20, 0),
     gsSP2Triangles(21, 22, 23, 0, 24, 25, 26, 0),
     gsSP1Triangle(27, 28, 29, 0),
     gsSPVertex(0x0400A2D0, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 1, 0, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(9, 10, 11, 6, 0),
-    gsSP1Quadrangle(6, 11, 12, 13, 0),
-    gsSP1Quadrangle(13, 14, 7, 6, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(9, 10, 11, 0, 9, 11, 6, 0),
+    gsSP2Triangles(6, 11, 12, 0, 6, 12, 13, 0),
+    gsSP2Triangles(13, 14, 7, 0, 13, 7, 6, 0),
     gsSP2Triangles(15, 16, 17, 0, 18, 19, 20, 0),
     gsSP2Triangles(21, 22, 23, 0, 24, 25, 26, 0),
     gsSP1Triangle(27, 28, 29, 0),
@@ -1357,22 +1357,22 @@ Gfx d_course_toads_turnpike_packed_dl_24C0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400A550, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(9, 10, 11, 6, 0),
-    gsSP1Quadrangle(6, 11, 12, 13, 0),
-    gsSP1Quadrangle(13, 14, 7, 6, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(9, 10, 11, 0, 9, 11, 6, 0),
+    gsSP2Triangles(6, 11, 12, 0, 6, 12, 13, 0),
+    gsSP2Triangles(13, 14, 7, 0, 13, 7, 6, 0),
     gsSP2Triangles(15, 16, 17, 0, 18, 19, 20, 0),
     gsSP2Triangles(21, 22, 23, 0, 24, 25, 26, 0),
     gsSP1Triangle(27, 28, 29, 0),
     gsSPVertex(0x0400A730, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(9, 8, 10, 11, 0),
-    gsSP1Quadrangle(11, 12, 13, 9, 0),
-    gsSP1Quadrangle(9, 13, 14, 6, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(9, 8, 10, 0, 9, 10, 11, 0),
+    gsSP2Triangles(11, 12, 13, 0, 11, 13, 9, 0),
+    gsSP2Triangles(9, 13, 14, 0, 9, 14, 6, 0),
     gsSP2Triangles(15, 16, 17, 0, 18, 19, 20, 0),
     gsSP2Triangles(21, 22, 23, 0, 24, 25, 26, 0),
     gsSP1Triangle(27, 28, 29, 0),
@@ -1401,9 +1401,9 @@ Gfx d_course_toads_turnpike_packed_dl_2600[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400A9B0, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 4, 5, 0, 0),
-    gsSP1Quadrangle(3, 2, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 4, 5, 0, 3, 5, 0, 0),
+    gsSP2Triangles(3, 2, 6, 0, 3, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 11, 12, 13, 0),
     gsSP2Triangles(14, 15, 16, 0, 17, 18, 19, 0),
     gsSP2Triangles(20, 21, 22, 0, 23, 24, 25, 0),
@@ -1413,8 +1413,8 @@ Gfx d_course_toads_turnpike_packed_dl_2600[] =
     gsSPVertex(0x0400AB90, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(6, 7, 8, 0, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(15, 14, 16, 17, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(15, 14, 16, 0, 15, 16, 17, 0),
     gsSP2Triangles(18, 19, 20, 0, 21, 22, 23, 0),
     gsSP2Triangles(24, 25, 26, 0, 27, 28, 29, 0),
     gsSP2Triangles(27, 29, 30, 0, 30, 29, 31, 0),
@@ -1439,7 +1439,7 @@ Gfx d_course_toads_turnpike_packed_dl_2600[] =
     gsSP2Triangles(4, 2, 1, 0, 4, 3, 2, 0),
     gsSP2Triangles(5, 6, 7, 0, 5, 8, 6, 0),
     gsSP2Triangles(8, 9, 6, 0, 9, 7, 6, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
     gsSP2Triangles(11, 14, 12, 0, 14, 13, 12, 0),
     gsSPEndDisplayList(),
 };
@@ -1456,22 +1456,22 @@ Gfx d_course_toads_turnpike_packed_dl_2798[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400B060, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(9, 10, 11, 6, 0),
-    gsSP1Quadrangle(6, 11, 12, 13, 0),
-    gsSP1Quadrangle(13, 14, 7, 6, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(9, 10, 11, 0, 9, 11, 6, 0),
+    gsSP2Triangles(6, 11, 12, 0, 6, 12, 13, 0),
+    gsSP2Triangles(13, 14, 7, 0, 13, 7, 6, 0),
     gsSP2Triangles(15, 16, 17, 0, 18, 19, 20, 0),
     gsSP2Triangles(21, 22, 23, 0, 24, 25, 26, 0),
     gsSP1Triangle(27, 28, 29, 0),
     gsSPVertex(0x0400B240, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(9, 8, 10, 11, 0),
-    gsSP1Quadrangle(11, 12, 13, 9, 0),
-    gsSP1Quadrangle(9, 13, 14, 6, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(9, 8, 10, 0, 9, 10, 11, 0),
+    gsSP2Triangles(11, 12, 13, 0, 11, 13, 9, 0),
+    gsSP2Triangles(9, 13, 14, 0, 9, 14, 6, 0),
     gsSP2Triangles(15, 16, 17, 0, 18, 19, 20, 0),
     gsSP2Triangles(21, 22, 23, 0, 24, 25, 26, 0),
     gsSP1Triangle(27, 28, 29, 0),
@@ -1500,8 +1500,8 @@ Gfx d_course_toads_turnpike_packed_dl_28D8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400B4C0, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
     gsSP2Triangles(6, 7, 8, 0, 9, 10, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 15, 16, 17, 0),
     gsSP2Triangles(18, 19, 20, 0, 21, 22, 23, 0),
@@ -1532,22 +1532,22 @@ Gfx d_course_toads_turnpike_packed_dl_29B8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400B6F0, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(9, 10, 11, 6, 0),
-    gsSP1Quadrangle(6, 11, 12, 13, 0),
-    gsSP1Quadrangle(13, 14, 7, 6, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(9, 10, 11, 0, 9, 11, 6, 0),
+    gsSP2Triangles(6, 11, 12, 0, 6, 12, 13, 0),
+    gsSP2Triangles(13, 14, 7, 0, 13, 7, 6, 0),
     gsSP2Triangles(15, 16, 17, 0, 18, 19, 20, 0),
     gsSP2Triangles(21, 22, 23, 0, 24, 25, 26, 0),
     gsSP1Triangle(27, 28, 29, 0),
     gsSPVertex(0x0400B8D0, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(9, 8, 10, 11, 0),
-    gsSP1Quadrangle(11, 12, 13, 9, 0),
-    gsSP1Quadrangle(9, 13, 14, 6, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(9, 8, 10, 0, 9, 10, 11, 0),
+    gsSP2Triangles(11, 12, 13, 0, 11, 13, 9, 0),
+    gsSP2Triangles(9, 13, 14, 0, 9, 14, 6, 0),
     gsSP2Triangles(15, 16, 17, 0, 18, 19, 20, 0),
     gsSP2Triangles(21, 22, 23, 0, 24, 25, 26, 0),
     gsSP1Triangle(27, 28, 29, 0),
@@ -1568,7 +1568,7 @@ Gfx d_course_toads_turnpike_packed_dl_2AF8[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x0400BB50, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD),
@@ -1579,7 +1579,7 @@ Gfx d_course_toads_turnpike_packed_dl_2AF8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400BB90, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -1603,19 +1603,19 @@ Gfx d_course_toads_turnpike_packed_dl_2AF8[] =
     gsSP2Triangles(9, 11, 12, 0, 12, 11, 13, 0),
     gsSP2Triangles(12, 13, 14, 0, 15, 16, 17, 0),
     gsSP2Triangles(18, 19, 20, 0, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 25, 24, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 25, 0, 28, 25, 24, 0),
     gsSPVertex(0x0400BF90, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 1, 0, 0),
-    gsSP1Quadrangle(3, 6, 7, 0, 0),
-    gsSP1Quadrangle(0, 7, 8, 4, 0),
-    gsSP1Quadrangle(9, 10, 11, 12, 0),
-    gsSP1Quadrangle(13, 14, 10, 9, 0),
-    gsSP1Quadrangle(15, 16, 17, 18, 0),
-    gsSP1Quadrangle(18, 19, 20, 15, 0),
-    gsSP1Quadrangle(15, 20, 21, 22, 0),
-    gsSP1Quadrangle(22, 23, 16, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0),
+    gsSP2Triangles(3, 6, 7, 0, 3, 7, 0, 0),
+    gsSP2Triangles(0, 7, 8, 0, 0, 8, 4, 0),
+    gsSP2Triangles(9, 10, 11, 0, 9, 11, 12, 0),
+    gsSP2Triangles(13, 14, 10, 0, 13, 10, 9, 0),
+    gsSP2Triangles(15, 16, 17, 0, 15, 17, 18, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 15, 0),
+    gsSP2Triangles(15, 20, 21, 0, 15, 21, 22, 0),
+    gsSP2Triangles(22, 23, 16, 0, 22, 16, 15, 0),
     gsSP2Triangles(24, 25, 26, 0, 27, 28, 29, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_MIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_MIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
@@ -1626,7 +1626,7 @@ Gfx d_course_toads_turnpike_packed_dl_2AF8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400C170, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -1636,7 +1636,7 @@ Gfx d_course_toads_turnpike_packed_dl_2AF8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400C1B0, 15, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(1, 4, 2, 0, 4, 3, 2, 0),
     gsSP2Triangles(5, 6, 7, 0, 8, 5, 7, 0),
     gsSP2Triangles(9, 7, 6, 0, 9, 8, 7, 0),
@@ -1648,7 +1648,7 @@ Gfx d_course_toads_turnpike_packed_dl_2AF8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400C2A0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1693,7 +1693,7 @@ Gfx d_course_toads_turnpike_packed_dl_2E40[] =
     gsSP2Triangles(2, 1, 4, 0, 5, 6, 7, 0),
     gsSP2Triangles(6, 8, 7, 0, 8, 9, 7, 0),
     gsSP2Triangles(10, 5, 7, 0, 11, 2, 4, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSP2Triangles(16, 12, 15, 0, 17, 16, 15, 0),
     gsSP2Triangles(18, 19, 20, 0, 19, 21, 20, 0),
     gsSP2Triangles(22, 23, 24, 0, 23, 25, 24, 0),
@@ -1717,7 +1717,7 @@ Gfx d_course_toads_turnpike_packed_dl_2EE0[] =
     gsSP2Triangles(4, 3, 2, 0, 4, 5, 3, 0),
     gsSP2Triangles(6, 7, 8, 0, 8, 9, 10, 0),
     gsSP2Triangles(8, 11, 9, 0, 6, 8, 10, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSP2Triangles(14, 16, 15, 0, 16, 17, 15, 0),
     gsSP2Triangles(18, 19, 20, 0, 21, 18, 22, 0),
     gsSP2Triangles(18, 20, 22, 0, 23, 21, 22, 0),
@@ -1746,7 +1746,7 @@ Gfx d_course_toads_turnpike_packed_dl_2FA0[] =
     gsSP2Triangles(6, 8, 7, 0, 9, 7, 8, 0),
     gsSP2Triangles(10, 11, 12, 0, 11, 13, 12, 0),
     gsSP2Triangles(13, 14, 12, 0, 14, 15, 12, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSP2Triangles(20, 19, 18, 0, 20, 21, 19, 0),
     gsSP2Triangles(22, 3, 4, 0, 23, 9, 8, 0),
     gsSP2Triangles(24, 25, 26, 0, 25, 27, 26, 0),
@@ -1873,8 +1873,8 @@ Gfx d_course_toads_turnpike_packed_dl_32A0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400D200, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2005,13 +2005,13 @@ Gfx d_course_toads_turnpike_packed_dl_36C0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400DA50, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 0, 3, 0, 1, 5, 2, 0),
     gsSP2Triangles(6, 7, 8, 0, 8, 7, 9, 0),
     gsSP2Triangles(7, 10, 9, 0, 11, 6, 8, 0),
     gsSP2Triangles(12, 13, 14, 0, 15, 12, 14, 0),
     gsSP2Triangles(16, 17, 13, 0, 17, 14, 13, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
     gsSP2Triangles(22, 18, 21, 0, 19, 23, 20, 0),
     gsSP2Triangles(24, 25, 26, 0, 25, 27, 26, 0),
     gsSP2Triangles(28, 26, 27, 0, 29, 30, 31, 0),
@@ -2065,7 +2065,7 @@ Gfx d_course_toads_turnpike_packed_dl_3850[] =
     gsSPVertex(0x0400DEE0, 22, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 4, 0),
     gsSP2Triangles(1, 4, 2, 0, 3, 5, 4, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsSP2Triangles(10, 6, 9, 0, 7, 11, 8, 0),
     gsSP2Triangles(12, 13, 14, 0, 13, 15, 14, 0),
     gsSP2Triangles(16, 17, 18, 0, 17, 16, 12, 0),
@@ -2176,8 +2176,8 @@ Gfx d_course_toads_turnpike_packed_dl_3B58[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400E6C0, 9, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
     gsSP1Triangle(6, 7, 8, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05006800),
     gsDPTileSync(),
@@ -2239,7 +2239,7 @@ Gfx d_course_toads_turnpike_packed_dl_3D00[] =
     gsSPVertex(0x0400EAE0, 16, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 4, 6, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 12, 15, 13, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05006800),
     gsDPTileSync(),
@@ -2249,11 +2249,11 @@ Gfx d_course_toads_turnpike_packed_dl_3D00[] =
     gsSPVertex(0x0400EBE0, 24, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 0, 2, 0),
     gsSP2Triangles(1, 4, 2, 0, 5, 3, 2, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsSP2Triangles(10, 6, 9, 0, 11, 10, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSP2Triangles(16, 12, 15, 0, 16, 17, 12, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
     gsSP2Triangles(20, 22, 21, 0, 22, 23, 21, 0),
     gsSPEndDisplayList(),
 };
@@ -2295,20 +2295,20 @@ Gfx d_course_toads_turnpike_packed_dl_3E90[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400ED60, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 9, 11, 10, 0),
-    gsSP1Quadrangle(12, 13, 8, 10, 0),
+    gsSP2Triangles(12, 13, 8, 0, 12, 8, 10, 0),
     gsSP2Triangles(14, 15, 16, 0, 15, 17, 16, 0),
-    gsSP1Quadrangle(17, 18, 19, 16, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(17, 18, 19, 0, 17, 19, 16, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSP2Triangles(21, 24, 22, 0, 21, 25, 24, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSP2Triangles(30, 29, 28, 0, 30, 31, 29, 0),
     gsSPVertex(0x0400EF60, 28, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 2, 1, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 2, 0, 4, 2, 1, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsSP2Triangles(10, 11, 12, 0, 11, 13, 12, 0),
     gsSP2Triangles(14, 15, 16, 0, 15, 17, 16, 0),
     gsSP2Triangles(18, 19, 16, 0, 19, 14, 16, 0),
@@ -2329,26 +2329,26 @@ Gfx d_course_toads_turnpike_packed_dl_3F80[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400F120, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 0, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 0, 0, 4, 0, 3, 0),
     gsSP2Triangles(6, 7, 8, 0, 9, 6, 8, 0),
-    gsSP1Quadrangle(7, 10, 11, 8, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(14, 16, 17, 15, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(19, 22, 23, 20, 0),
+    gsSP2Triangles(7, 10, 11, 0, 7, 11, 8, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(14, 16, 17, 0, 14, 17, 15, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(19, 22, 23, 0, 19, 23, 20, 0),
     gsSP2Triangles(24, 25, 26, 0, 25, 27, 28, 0),
     gsSP2Triangles(25, 28, 26, 0, 29, 24, 26, 0),
     gsSPVertex(0x0400F300, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(1, 4, 2, 0, 1, 5, 4, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(6, 9, 10, 11, 0),
-    gsSP1Quadrangle(7, 12, 13, 8, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(6, 9, 10, 0, 6, 10, 11, 0),
+    gsSP2Triangles(7, 12, 13, 0, 7, 13, 8, 0),
     gsSP2Triangles(14, 11, 10, 0, 14, 15, 11, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 18, 17, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 18, 0, 20, 18, 17, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
     gsSP2Triangles(24, 26, 25, 0, 26, 27, 25, 0),
     gsSP2Triangles(28, 29, 30, 0, 31, 28, 30, 0),
     gsSPVertex(0x0400F500, 10, 0),
@@ -2370,27 +2370,27 @@ Gfx d_course_toads_turnpike_packed_dl_40A8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400F5A0, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(2, 4, 3, 0, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 9, 8, 11, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 9, 8, 0, 10, 8, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 13, 15, 14, 0),
-    gsSP1Quadrangle(16, 17, 12, 14, 0),
+    gsSP2Triangles(16, 17, 12, 0, 16, 12, 14, 0),
     gsSP2Triangles(18, 19, 20, 0, 18, 21, 19, 0),
-    gsSP1Quadrangle(19, 22, 23, 20, 0),
+    gsSP2Triangles(19, 22, 23, 0, 19, 23, 20, 0),
     gsSP2Triangles(24, 25, 26, 0, 25, 27, 26, 0),
-    gsSP1Quadrangle(27, 28, 29, 26, 0),
+    gsSP2Triangles(27, 28, 29, 0, 27, 29, 26, 0),
     gsSPVertex(0x0400F780, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 3, 2, 0, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsSP2Triangles(10, 9, 8, 0, 10, 11, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 15, 14, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(20, 22, 23, 21, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(25, 28, 29, 26, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 15, 14, 0, 16, 14, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(25, 28, 29, 0, 25, 29, 26, 0),
     gsSPVertex(0x0400F960, 12, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
     gsSP2Triangles(4, 0, 2, 0, 5, 4, 2, 0),
@@ -2411,30 +2411,30 @@ Gfx d_course_toads_turnpike_packed_dl_41D0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400FA20, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 2, 1, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 2, 0, 4, 2, 1, 0),
     gsSP2Triangles(6, 7, 8, 0, 7, 9, 10, 0),
     gsSP2Triangles(7, 10, 8, 0, 11, 6, 8, 0),
     gsSP2Triangles(12, 13, 14, 0, 13, 15, 14, 0),
     gsSP2Triangles(16, 17, 18, 0, 16, 19, 17, 0),
     gsSP2Triangles(17, 20, 18, 0, 17, 21, 20, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
     gsSP2Triangles(24, 26, 25, 0, 26, 27, 25, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0400FC20, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 0, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 0, 0, 4, 0, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsSP2Triangles(7, 10, 8, 0, 7, 11, 10, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(14, 16, 17, 15, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(14, 16, 17, 0, 14, 17, 15, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
     gsSP2Triangles(22, 21, 20, 0, 22, 23, 21, 0),
     gsSP2Triangles(24, 25, 26, 0, 25, 27, 26, 0),
     gsSP2Triangles(28, 29, 26, 0, 29, 24, 26, 0),
     gsSPVertex(0x0400FE00, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2450,13 +2450,13 @@ Gfx d_course_toads_turnpike_packed_dl_42E8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400FE60, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSP2Triangles(28, 29, 30, 0, 28, 31, 29, 0),
     gsSPVertex(0x04010060, 16, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
@@ -2480,21 +2480,21 @@ Gfx d_course_toads_turnpike_packed_dl_43A8[] =
     gsSPVertex(0x04010160, 30, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 0, 2, 0),
     gsSP2Triangles(4, 2, 1, 0, 4, 5, 2, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 9, 8, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 9, 8, 0, 10, 8, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSP2Triangles(14, 16, 15, 0, 16, 17, 15, 0),
     gsSP2Triangles(18, 19, 20, 0, 18, 21, 19, 0),
     gsSP2Triangles(19, 22, 20, 0, 19, 23, 22, 0),
     gsSP2Triangles(24, 25, 26, 0, 25, 27, 26, 0),
-    gsSP1Quadrangle(27, 28, 29, 26, 0),
+    gsSP2Triangles(27, 28, 29, 0, 27, 29, 26, 0),
     gsSPVertex(0x04010340, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
     gsSP2Triangles(3, 4, 2, 0, 4, 5, 2, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 8, 7, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 8, 0, 10, 8, 7, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSP2Triangles(20, 16, 21, 0, 16, 19, 21, 0),
     gsSP2Triangles(22, 23, 24, 0, 23, 25, 24, 0),
     gsSP2Triangles(26, 27, 24, 0, 25, 26, 24, 0),
@@ -2519,12 +2519,12 @@ Gfx d_course_toads_turnpike_packed_dl_44C0[] =
     gsSPVertex(0x040105C0, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
     gsSP2Triangles(3, 4, 1, 0, 1, 5, 6, 0),
-    gsSP1Quadrangle(7, 5, 8, 9, 0),
-    gsSP1Quadrangle(6, 5, 7, 10, 0),
-    gsSP1Quadrangle(11, 12, 13, 14, 0),
+    gsSP2Triangles(7, 5, 8, 0, 7, 8, 9, 0),
+    gsSP2Triangles(6, 5, 7, 0, 6, 7, 10, 0),
+    gsSP2Triangles(11, 12, 13, 0, 11, 13, 14, 0),
     gsSP2Triangles(15, 16, 17, 0, 18, 19, 20, 0),
-    gsSP1Quadrangle(21, 22, 23, 24, 0),
-    gsSP1Quadrangle(25, 26, 27, 28, 0),
+    gsSP2Triangles(21, 22, 23, 0, 21, 23, 24, 0),
+    gsSP2Triangles(25, 26, 27, 0, 25, 27, 28, 0),
     gsSP1Triangle(29, 30, 31, 0),
     gsSPVertex(0x040107C0, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
@@ -2534,7 +2534,7 @@ Gfx d_course_toads_turnpike_packed_dl_44C0[] =
     gsSP2Triangles(16, 17, 18, 0, 17, 19, 18, 0),
     gsSP2Triangles(20, 21, 22, 0, 21, 23, 22, 0),
     gsSP2Triangles(24, 25, 26, 0, 25, 27, 26, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x040109C0, 4, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
     gsSPEndDisplayList(),
@@ -2553,16 +2553,16 @@ Gfx d_course_toads_turnpike_packed_dl_45B8[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04010A00, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSP2Triangles(28, 29, 30, 0, 29, 31, 30, 0),
     gsSPVertex(0x04010C00, 16, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 8, 11, 9, 0),
     gsSP2Triangles(12, 13, 14, 0, 13, 15, 14, 0),
     gsSPEndDisplayList(),
@@ -2581,12 +2581,12 @@ Gfx d_course_toads_turnpike_packed_dl_4678[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04010D00, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSP2Triangles(28, 29, 30, 0, 28, 31, 29, 0),
     gsSPVertex(0x04010F00, 16, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
@@ -2608,26 +2608,26 @@ Gfx d_course_toads_turnpike_packed_dl_4738[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04011000, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(1, 4, 2, 0, 1, 5, 4, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsSP2Triangles(10, 11, 12, 0, 11, 13, 12, 0),
-    gsSP1Quadrangle(13, 14, 15, 12, 0),
+    gsSP2Triangles(13, 14, 15, 0, 13, 15, 12, 0),
     gsSP2Triangles(16, 17, 18, 0, 16, 19, 17, 0),
     gsSP2Triangles(17, 20, 18, 0, 17, 21, 20, 0),
     gsSP2Triangles(22, 23, 24, 0, 23, 25, 26, 0),
     gsSP2Triangles(23, 26, 24, 0, 27, 22, 24, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04011200, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(6, 8, 7, 0, 8, 9, 7, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
     gsSP2Triangles(14, 13, 12, 0, 14, 15, 13, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 18, 17, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(24, 26, 27, 25, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 18, 0, 20, 18, 17, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(24, 26, 27, 0, 24, 27, 25, 0),
     gsSP2Triangles(28, 29, 30, 0, 29, 31, 30, 0),
     gsSPVertex(0x04011400, 8, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
@@ -2647,16 +2647,16 @@ Gfx d_course_toads_turnpike_packed_dl_4850[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04011480, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 13, 15, 14, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSP2Triangles(20, 21, 22, 0, 21, 23, 22, 0),
     gsSP2Triangles(24, 25, 26, 0, 25, 27, 26, 0),
     gsSP2Triangles(28, 29, 30, 0, 28, 31, 29, 0),
     gsSPVertex(0x04011680, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 5, 7, 6, 0),
     gsSP2Triangles(8, 9, 10, 0, 9, 11, 10, 0),
     gsSP2Triangles(12, 13, 14, 0, 12, 15, 13, 0),
@@ -2675,10 +2675,10 @@ Gfx d_course_toads_turnpike_packed_dl_4910[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04011780, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 3, 2, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(7, 10, 11, 8, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 3, 0, 4, 3, 2, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(7, 10, 11, 0, 7, 11, 8, 0),
     gsSP2Triangles(12, 13, 14, 0, 15, 12, 14, 0),
     gsSP2Triangles(12, 16, 13, 0, 17, 18, 19, 0),
     gsSP2Triangles(20, 17, 19, 0, 21, 20, 19, 0),
@@ -2717,13 +2717,13 @@ Gfx d_course_toads_turnpike_packed_dl_4A40[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04011C70, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSP2Triangles(28, 29, 30, 0, 29, 31, 30, 0),
     gsSPVertex(0x04011E70, 16, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
@@ -2745,22 +2745,22 @@ Gfx d_course_toads_turnpike_packed_dl_4B00[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04011F70, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 9, 11, 10, 0),
     gsSP2Triangles(9, 12, 11, 0, 13, 8, 10, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(19, 22, 23, 20, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(25, 28, 29, 26, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(19, 22, 23, 0, 19, 23, 20, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(25, 28, 29, 0, 25, 29, 26, 0),
     gsSPVertex(0x04012150, 26, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 5, 7, 6, 0),
     gsSP2Triangles(7, 8, 6, 0, 9, 10, 11, 0),
     gsSP2Triangles(9, 12, 10, 0, 13, 14, 15, 0),
     gsSP2Triangles(13, 16, 14, 0, 7, 17, 8, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
     gsSP2Triangles(22, 23, 24, 0, 22, 25, 23, 0),
     gsSPEndDisplayList(),
 };
@@ -2777,23 +2777,23 @@ Gfx d_course_toads_turnpike_packed_dl_4BE0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040122F0, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 3, 2, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 9, 8, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 3, 0, 4, 3, 2, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 9, 0, 10, 9, 8, 0),
     gsSP2Triangles(12, 13, 14, 0, 13, 15, 14, 0),
     gsSP2Triangles(16, 12, 14, 0, 17, 18, 19, 0),
-    gsSP1Quadrangle(18, 20, 21, 19, 0),
+    gsSP2Triangles(18, 20, 21, 0, 18, 21, 19, 0),
     gsSP2Triangles(16, 22, 12, 0, 23, 24, 25, 0),
     gsSP2Triangles(23, 25, 26, 0, 27, 28, 29, 0),
     gsSP1Triangle(27, 29, 30, 0),
     gsSPVertex(0x040124E0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 3, 2, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(7, 10, 11, 8, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(13, 16, 17, 14, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 3, 0, 4, 3, 2, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(7, 10, 11, 0, 7, 11, 8, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(13, 16, 17, 0, 13, 17, 14, 0),
     gsSP2Triangles(18, 19, 20, 0, 21, 22, 23, 0),
     gsSP2Triangles(24, 21, 23, 0, 21, 25, 22, 0),
     gsSP2Triangles(26, 24, 23, 0, 27, 28, 29, 0),
@@ -2819,8 +2819,8 @@ Gfx d_course_toads_turnpike_packed_dl_4D10[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040127D0, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
     gsSP2Triangles(6, 7, 8, 0, 7, 9, 8, 0),
     gsSP2Triangles(7, 10, 9, 0, 11, 6, 8, 0),
     gsSP2Triangles(12, 13, 14, 0, 13, 15, 14, 0),
@@ -2830,11 +2830,11 @@ Gfx d_course_toads_turnpike_packed_dl_4D10[] =
     gsSP2Triangles(25, 24, 26, 0, 27, 28, 29, 0),
     gsSP1Triangle(27, 29, 30, 0),
     gsSPVertex(0x040129C0, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(5, 8, 9, 6, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 13, 12, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(5, 8, 9, 0, 5, 9, 6, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 13, 0, 14, 13, 12, 0),
     gsSP2Triangles(16, 17, 18, 0, 19, 20, 21, 0),
     gsSP2Triangles(19, 22, 20, 0, 20, 23, 21, 0),
     gsSP2Triangles(23, 24, 21, 0, 25, 26, 27, 0),
@@ -2842,8 +2842,8 @@ Gfx d_course_toads_turnpike_packed_dl_4D10[] =
     gsSP1Triangle(30, 25, 27, 0),
     gsSPVertex(0x04012BB0, 10, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 0, 2, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(6, 8, 9, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(6, 8, 9, 0, 6, 9, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2865,7 +2865,7 @@ Gfx d_course_toads_turnpike_packed_dl_4E30[] =
     gsSP2Triangles(12, 13, 14, 0, 13, 15, 14, 0),
     gsSP2Triangles(16, 17, 18, 0, 17, 19, 18, 0),
     gsSP2Triangles(20, 21, 22, 0, 21, 23, 22, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSP2Triangles(28, 29, 30, 0, 29, 31, 30, 0),
     gsSPVertex(0x04012E50, 16, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
@@ -2888,16 +2888,16 @@ Gfx d_course_toads_turnpike_packed_dl_4EF0[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04012F50, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSP2Triangles(28, 29, 30, 0, 29, 31, 30, 0),
     gsSPVertex(0x04013150, 16, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 8, 11, 9, 0),
     gsSP2Triangles(12, 13, 14, 0, 12, 15, 13, 0),
     gsSPEndDisplayList(),
@@ -2915,21 +2915,21 @@ Gfx d_course_toads_turnpike_packed_dl_4FB0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04013250, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 9, 11, 10, 0),
-    gsSP1Quadrangle(11, 12, 13, 10, 0),
+    gsSP2Triangles(11, 12, 13, 0, 11, 13, 10, 0),
     gsSP2Triangles(14, 15, 16, 0, 14, 17, 15, 0),
     gsSP2Triangles(15, 18, 16, 0, 15, 19, 18, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSP2Triangles(25, 28, 26, 0, 25, 29, 28, 0),
     gsSPVertex(0x04013430, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 3, 2, 0, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(8, 10, 11, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSP2Triangles(14, 16, 15, 0, 16, 17, 15, 0),
     gsSP2Triangles(18, 19, 20, 0, 18, 21, 19, 0),
     gsSP2Triangles(22, 23, 24, 0, 23, 25, 24, 0),
@@ -2949,26 +2949,26 @@ Gfx d_course_toads_turnpike_packed_dl_50A0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04013610, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsSP2Triangles(10, 9, 8, 0, 10, 11, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 14, 13, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 14, 0, 16, 14, 13, 0),
     gsSP2Triangles(18, 19, 20, 0, 19, 21, 20, 0),
-    gsSP1Quadrangle(22, 23, 18, 20, 0),
+    gsSP2Triangles(22, 23, 18, 0, 22, 18, 20, 0),
     gsSP2Triangles(24, 25, 26, 0, 24, 27, 25, 0),
-    gsSP1Quadrangle(25, 28, 29, 26, 0),
+    gsSP2Triangles(25, 28, 29, 0, 25, 29, 26, 0),
     gsSPVertex(0x040137F0, 30, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
-    gsSP1Quadrangle(3, 4, 5, 2, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(3, 4, 5, 0, 3, 5, 2, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsSP2Triangles(10, 9, 8, 0, 10, 11, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 15, 14, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 15, 14, 0, 16, 14, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
     gsSP2Triangles(19, 22, 20, 0, 19, 23, 22, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSP2Triangles(26, 28, 27, 0, 28, 29, 27, 0),
     gsSPVertex(0x040139D0, 12, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
@@ -3016,7 +3016,7 @@ Gfx d_course_toads_turnpike_packed_dl_5270[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04013A90, 30, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 0, 2, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 9, 11, 10, 0),
     gsSP2Triangles(12, 13, 14, 0, 15, 16, 12, 0),
     gsSP2Triangles(15, 12, 14, 0, 13, 17, 14, 0),
@@ -3024,13 +3024,13 @@ Gfx d_course_toads_turnpike_packed_dl_5270[] =
     gsSP2Triangles(20, 19, 18, 0, 21, 20, 18, 0),
     gsSP2Triangles(22, 20, 21, 0, 23, 22, 21, 0),
     gsSP2Triangles(24, 4, 7, 0, 25, 24, 7, 0),
-    gsSP1Quadrangle(26, 24, 25, 27, 0),
-    gsSP1Quadrangle(28, 29, 26, 27, 0),
+    gsSP2Triangles(26, 24, 25, 0, 26, 25, 27, 0),
+    gsSP2Triangles(28, 29, 26, 0, 28, 26, 27, 0),
     gsSPVertex(0x04013C70, 18, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 0, 4, 0),
     gsSP2Triangles(0, 3, 1, 0, 5, 3, 4, 0),
     gsSP2Triangles(1, 6, 2, 0, 6, 7, 2, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSP2Triangles(10, 12, 13, 0, 11, 10, 13, 0),
     gsSP2Triangles(14, 15, 16, 0, 14, 17, 15, 0),
     gsSP2Triangles(15, 17, 4, 0, 17, 5, 4, 0),
@@ -3050,13 +3050,13 @@ Gfx d_course_toads_turnpike_packed_dl_5360[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04013D90, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 0, 2, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 9, 11, 10, 0),
     gsSP2Triangles(9, 12, 11, 0, 11, 12, 13, 0),
     gsSP2Triangles(12, 14, 13, 0, 15, 3, 2, 0),
     gsSP2Triangles(15, 16, 3, 0, 16, 15, 17, 0),
     gsSP2Triangles(18, 16, 17, 0, 19, 8, 10, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSP2Triangles(21, 20, 24, 0, 25, 21, 24, 0),
     gsSP2Triangles(22, 19, 23, 0, 22, 8, 19, 0),
     gsSP2Triangles(26, 27, 28, 0, 27, 26, 25, 0),
@@ -3089,12 +3089,12 @@ Gfx d_course_toads_turnpike_packed_dl_5480[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04014110, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 5, 7, 6, 0),
     gsSP2Triangles(8, 9, 10, 0, 9, 11, 12, 0),
     gsSP2Triangles(8, 11, 9, 0, 11, 13, 12, 0),
     gsSP2Triangles(13, 14, 12, 0, 14, 15, 12, 0),
-    gsSP1Quadrangle(15, 14, 16, 17, 0),
+    gsSP2Triangles(15, 14, 16, 0, 15, 16, 17, 0),
     gsSP2Triangles(18, 8, 10, 0, 19, 20, 21, 0),
     gsSP2Triangles(19, 21, 22, 0, 21, 18, 23, 0),
     gsSP2Triangles(21, 23, 22, 0, 23, 18, 10, 0),
@@ -3167,19 +3167,19 @@ Gfx d_course_toads_turnpike_packed_dl_56B0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040147F0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x040149F0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3195,7 +3195,7 @@ Gfx d_course_toads_turnpike_packed_dl_5770[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04014AF0, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 4, 6, 0),
     gsSP2Triangles(8, 9, 10, 0, 9, 8, 11, 0),
     gsSP2Triangles(12, 8, 10, 0, 9, 11, 13, 0),
@@ -3216,7 +3216,7 @@ Gfx d_course_toads_turnpike_packed_dl_5770[] =
     gsSP2Triangles(9, 3, 6, 0, 13, 11, 12, 0),
     gsSP2Triangles(14, 15, 16, 0, 17, 14, 16, 0),
     gsSP2Triangles(15, 18, 16, 0, 18, 19, 16, 0),
-    gsSP1Quadrangle(19, 18, 13, 12, 0),
+    gsSP2Triangles(19, 18, 13, 0, 19, 13, 12, 0),
     gsSP2Triangles(20, 21, 22, 0, 21, 23, 22, 0),
     gsSPEndDisplayList(),
 };
@@ -3233,22 +3233,22 @@ Gfx d_course_toads_turnpike_packed_dl_5880[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04014E50, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 9, 11, 10, 0),
     gsSP2Triangles(8, 10, 12, 0, 13, 8, 12, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(17, 16, 18, 19, 0),
-    gsSP1Quadrangle(19, 18, 20, 21, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(17, 16, 18, 0, 17, 18, 19, 0),
+    gsSP2Triangles(19, 18, 20, 0, 19, 20, 21, 0),
     gsSP2Triangles(22, 23, 24, 0, 25, 23, 26, 0),
     gsSP2Triangles(23, 22, 26, 0, 22, 24, 27, 0),
     gsSP2Triangles(7, 25, 26, 0, 7, 6, 25, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04015050, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
-    gsSP1Quadrangle(5, 4, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
+    gsSP2Triangles(5, 4, 6, 0, 5, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3265,7 +3265,7 @@ Gfx d_course_toads_turnpike_packed_dl_5958[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04015110, 28, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 4, 7, 0, 5, 9, 6, 0),
     gsSP2Triangles(5, 10, 11, 0, 9, 5, 11, 0),
     gsSP2Triangles(11, 10, 12, 0, 10, 13, 12, 0),
@@ -3273,7 +3273,7 @@ Gfx d_course_toads_turnpike_packed_dl_5958[] =
     gsSP2Triangles(15, 16, 17, 0, 14, 15, 17, 0),
     gsSP2Triangles(18, 19, 20, 0, 20, 19, 21, 0),
     gsSP2Triangles(22, 18, 20, 0, 19, 23, 21, 0),
-    gsSP1Quadrangle(21, 23, 3, 0, 0),
+    gsSP2Triangles(21, 23, 3, 0, 21, 3, 0, 0),
     gsSP2Triangles(24, 18, 22, 0, 25, 24, 22, 0),
     gsSP2Triangles(26, 24, 25, 0, 27, 26, 25, 0),
     gsDPTileSync(),
@@ -3298,11 +3298,11 @@ Gfx d_course_toads_turnpike_packed_dl_5958[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x040153B0, 14, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 4, 7, 0, 5, 9, 6, 0),
     gsSP2Triangles(8, 7, 10, 0, 11, 8, 10, 0),
     gsSP2Triangles(11, 10, 12, 0, 13, 11, 12, 0),
-    gsSP1Quadrangle(9, 5, 3, 0, 0),
+    gsSP2Triangles(9, 5, 3, 0, 9, 3, 0, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3324,8 +3324,8 @@ Gfx d_course_toads_turnpike_packed_dl_5AE8[] =
     gsSP2Triangles(11, 12, 10, 0, 12, 13, 10, 0),
     gsSP2Triangles(14, 15, 16, 0, 17, 14, 16, 0),
     gsSP2Triangles(12, 18, 13, 0, 18, 19, 13, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(23, 22, 24, 25, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(23, 22, 24, 0, 23, 24, 25, 0),
     gsSP2Triangles(26, 27, 28, 0, 27, 29, 28, 0),
     gsSPVertex(0x04015670, 10, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 0, 2, 0),
@@ -3340,10 +3340,10 @@ Gfx d_course_toads_turnpike_packed_dl_5AE8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04015710, 14, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(3, 2, 4, 0, 5, 4, 6, 0),
     gsSP2Triangles(5, 6, 7, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(7, 6, 8, 9, 0),
+    gsSP2Triangles(7, 6, 8, 0, 7, 8, 9, 0),
     gsSP2Triangles(8, 10, 9, 0, 10, 11, 9, 0),
     gsSP2Triangles(10, 12, 11, 0, 12, 13, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500A800),
@@ -3411,19 +3411,19 @@ Gfx d_course_toads_turnpike_packed_dl_5D90[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04015C90, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04015E90, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3439,32 +3439,32 @@ Gfx d_course_toads_turnpike_packed_dl_5E50[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04015F90, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(14, 13, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 12, 15, 0),
-    gsSP1Quadrangle(20, 19, 18, 21, 0),
-    gsSP1Quadrangle(22, 23, 20, 21, 0),
-    gsSP1Quadrangle(24, 23, 22, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
-    gsSP1Quadrangle(28, 30, 31, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(14, 13, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 12, 0, 18, 12, 15, 0),
+    gsSP2Triangles(20, 19, 18, 0, 20, 18, 21, 0),
+    gsSP2Triangles(22, 23, 20, 0, 22, 20, 21, 0),
+    gsSP2Triangles(24, 23, 22, 0, 24, 22, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
+    gsSP2Triangles(28, 30, 31, 0, 28, 31, 29, 0),
     gsSPVertex(0x04016190, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 0, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(8, 5, 4, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 7, 6, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 0, 0, 4, 0, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(8, 5, 4, 0, 8, 4, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 7, 6, 0, 14, 6, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04016390, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 0, 3, 0),
-    gsSP1Quadrangle(6, 5, 4, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 0, 0, 4, 0, 3, 0),
+    gsSP2Triangles(6, 5, 4, 0, 6, 4, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3480,18 +3480,18 @@ Gfx d_course_toads_turnpike_packed_dl_5F78[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04016410, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 9, 8, 0),
-    gsSP1Quadrangle(11, 10, 14, 15, 0),
-    gsSP1Quadrangle(15, 14, 1, 0, 0),
-    gsSP1Quadrangle(16, 17, 13, 12, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(21, 20, 22, 23, 0),
-    gsSP1Quadrangle(23, 22, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 19, 18, 0),
-    gsSP1Quadrangle(7, 6, 28, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 9, 0, 12, 9, 8, 0),
+    gsSP2Triangles(11, 10, 14, 0, 11, 14, 15, 0),
+    gsSP2Triangles(15, 14, 1, 0, 15, 1, 0, 0),
+    gsSP2Triangles(16, 17, 13, 0, 16, 13, 12, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(21, 20, 22, 0, 21, 22, 23, 0),
+    gsSP2Triangles(23, 22, 24, 0, 23, 24, 25, 0),
+    gsSP2Triangles(26, 27, 19, 0, 26, 19, 18, 0),
+    gsSP2Triangles(7, 6, 28, 0, 7, 28, 29, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3507,23 +3507,23 @@ Gfx d_course_toads_turnpike_packed_dl_6030[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040165F0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 5, 4, 0),
-    gsSP1Quadrangle(7, 6, 10, 11, 0),
-    gsSP1Quadrangle(11, 10, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(16, 18, 19, 17, 0),
-    gsSP1Quadrangle(19, 18, 0, 3, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(23, 22, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 21, 20, 0),
-    gsSP1Quadrangle(28, 29, 27, 26, 0),
-    gsSP1Quadrangle(30, 29, 28, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 5, 0, 8, 5, 4, 0),
+    gsSP2Triangles(7, 6, 10, 0, 7, 10, 11, 0),
+    gsSP2Triangles(11, 10, 12, 0, 11, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(16, 18, 19, 0, 16, 19, 17, 0),
+    gsSP2Triangles(19, 18, 0, 0, 19, 0, 3, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(23, 22, 24, 0, 23, 24, 25, 0),
+    gsSP2Triangles(26, 27, 21, 0, 26, 21, 20, 0),
+    gsSP2Triangles(28, 29, 27, 0, 28, 27, 26, 0),
+    gsSP2Triangles(30, 29, 28, 0, 30, 28, 31, 0),
     gsSPVertex(0x040167F0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 0, 3, 0),
-    gsSP1Quadrangle(2, 1, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 0, 0, 4, 0, 3, 0),
+    gsSP2Triangles(2, 1, 6, 0, 2, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3539,31 +3539,31 @@ Gfx d_course_toads_turnpike_packed_dl_6110[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04016870, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 1, 4, 5, 0),
-    gsSP1Quadrangle(4, 6, 7, 5, 0),
-    gsSP1Quadrangle(8, 9, 0, 3, 0),
-    gsSP1Quadrangle(10, 9, 8, 11, 0),
-    gsSP1Quadrangle(12, 13, 10, 11, 0),
-    gsSP1Quadrangle(14, 13, 12, 15, 0),
-    gsSP1Quadrangle(7, 6, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(19, 22, 23, 20, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(26, 28, 29, 27, 0),
-    gsSP1Quadrangle(16, 25, 24, 17, 0),
-    gsSP1Quadrangle(30, 31, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 1, 4, 0, 2, 4, 5, 0),
+    gsSP2Triangles(4, 6, 7, 0, 4, 7, 5, 0),
+    gsSP2Triangles(8, 9, 0, 0, 8, 0, 3, 0),
+    gsSP2Triangles(10, 9, 8, 0, 10, 8, 11, 0),
+    gsSP2Triangles(12, 13, 10, 0, 12, 10, 11, 0),
+    gsSP2Triangles(14, 13, 12, 0, 14, 12, 15, 0),
+    gsSP2Triangles(7, 6, 16, 0, 7, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(19, 22, 23, 0, 19, 23, 20, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(26, 28, 29, 0, 26, 29, 27, 0),
+    gsSP2Triangles(16, 25, 24, 0, 16, 24, 17, 0),
+    gsSP2Triangles(30, 31, 14, 0, 30, 14, 15, 0),
     gsSPVertex(0x04016A70, 22, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 1, 4, 5, 0),
-    gsSP1Quadrangle(4, 6, 7, 5, 0),
-    gsSP1Quadrangle(7, 6, 8, 9, 0),
-    gsSP1Quadrangle(8, 10, 11, 9, 0),
-    gsSP1Quadrangle(11, 10, 12, 13, 0),
-    gsSP1Quadrangle(12, 14, 15, 13, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(18, 20, 21, 19, 0),
-    gsSP1Quadrangle(21, 20, 0, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 1, 4, 0, 2, 4, 5, 0),
+    gsSP2Triangles(4, 6, 7, 0, 4, 7, 5, 0),
+    gsSP2Triangles(7, 6, 8, 0, 7, 8, 9, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0),
+    gsSP2Triangles(11, 10, 12, 0, 11, 12, 13, 0),
+    gsSP2Triangles(12, 14, 15, 0, 12, 15, 13, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(18, 20, 21, 0, 18, 21, 19, 0),
+    gsSP2Triangles(21, 20, 0, 0, 21, 0, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3579,30 +3579,30 @@ Gfx d_course_toads_turnpike_packed_dl_6230[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04016BD0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(5, 4, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 1, 0, 0),
-    gsSP1Quadrangle(10, 9, 8, 11, 0),
-    gsSP1Quadrangle(12, 13, 10, 11, 0),
-    gsSP1Quadrangle(6, 14, 15, 7, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 16, 19, 0),
-    gsSP1Quadrangle(22, 21, 20, 23, 0),
-    gsSP1Quadrangle(15, 14, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(5, 4, 6, 0, 5, 6, 7, 0),
+    gsSP2Triangles(8, 9, 1, 0, 8, 1, 0, 0),
+    gsSP2Triangles(10, 9, 8, 0, 10, 8, 11, 0),
+    gsSP2Triangles(12, 13, 10, 0, 12, 10, 11, 0),
+    gsSP2Triangles(6, 14, 15, 0, 6, 15, 7, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 16, 0, 20, 16, 19, 0),
+    gsSP2Triangles(22, 21, 20, 0, 22, 20, 23, 0),
+    gsSP2Triangles(15, 14, 22, 0, 15, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04016DD0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04016FD0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3618,19 +3618,19 @@ Gfx d_course_toads_turnpike_packed_dl_6348[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04017010, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04017210, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3646,19 +3646,19 @@ Gfx d_course_toads_turnpike_packed_dl_6408[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04017310, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(11, 10, 12, 13, 0),
-    gsSP1Quadrangle(13, 12, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(11, 10, 12, 0, 11, 12, 13, 0),
+    gsSP2Triangles(13, 12, 14, 0, 13, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04017510, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3674,25 +3674,25 @@ Gfx d_course_toads_turnpike_packed_dl_64C8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040175D0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 5, 4, 0),
-    gsSP1Quadrangle(7, 6, 10, 11, 0),
-    gsSP1Quadrangle(10, 12, 13, 11, 0),
-    gsSP1Quadrangle(13, 12, 14, 15, 0),
-    gsSP1Quadrangle(14, 16, 17, 15, 0),
-    gsSP1Quadrangle(18, 19, 9, 8, 0),
-    gsSP1Quadrangle(17, 16, 0, 3, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 5, 0, 8, 5, 4, 0),
+    gsSP2Triangles(7, 6, 10, 0, 7, 10, 11, 0),
+    gsSP2Triangles(10, 12, 13, 0, 10, 13, 11, 0),
+    gsSP2Triangles(13, 12, 14, 0, 13, 14, 15, 0),
+    gsSP2Triangles(14, 16, 17, 0, 14, 17, 15, 0),
+    gsSP2Triangles(18, 19, 9, 0, 18, 9, 8, 0),
+    gsSP2Triangles(17, 16, 0, 0, 17, 0, 3, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x040177D0, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3708,32 +3708,32 @@ Gfx d_course_toads_turnpike_packed_dl_65B8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04017950, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(5, 4, 6, 7, 0),
-    gsSP1Quadrangle(8, 1, 0, 9, 0),
-    gsSP1Quadrangle(10, 11, 8, 9, 0),
-    gsSP1Quadrangle(12, 11, 10, 13, 0),
-    gsSP1Quadrangle(14, 15, 12, 13, 0),
-    gsSP1Quadrangle(6, 16, 17, 7, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(20, 22, 23, 21, 0),
-    gsSP1Quadrangle(24, 19, 18, 25, 0),
-    gsSP1Quadrangle(17, 16, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(5, 4, 6, 0, 5, 6, 7, 0),
+    gsSP2Triangles(8, 1, 0, 0, 8, 0, 9, 0),
+    gsSP2Triangles(10, 11, 8, 0, 10, 8, 9, 0),
+    gsSP2Triangles(12, 11, 10, 0, 12, 10, 13, 0),
+    gsSP2Triangles(14, 15, 12, 0, 14, 12, 13, 0),
+    gsSP2Triangles(6, 16, 17, 0, 6, 17, 7, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0),
+    gsSP2Triangles(24, 19, 18, 0, 24, 18, 25, 0),
+    gsSP2Triangles(17, 16, 24, 0, 17, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPVertex(0x04017B30, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04017D30, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3775,18 +3775,18 @@ Gfx d_course_toads_turnpike_packed_dl_6788[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04017DF0, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(4, 8, 9, 0, 10, 11, 12, 0),
-    gsSP1Quadrangle(10, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(10, 13, 14, 0, 10, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04017FF0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(0, 4, 5, 0, 6, 7, 8, 0),
     gsSP2Triangles(6, 8, 9, 0, 10, 11, 12, 0),
-    gsSP1Quadrangle(10, 13, 14, 15, 0),
+    gsSP2Triangles(10, 13, 14, 0, 10, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3802,19 +3802,19 @@ Gfx d_course_toads_turnpike_packed_dl_6848[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040180F0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(7, 9, 10, 0, 11, 12, 13, 0),
     gsSP2Triangles(11, 13, 14, 0, 11, 15, 16, 0),
-    gsSP1Quadrangle(17, 18, 19, 20, 0),
-    gsSP1Quadrangle(21, 22, 23, 24, 0),
-    gsSP1Quadrangle(25, 26, 27, 28, 0),
-    gsSP1Quadrangle(25, 29, 30, 31, 0),
+    gsSP2Triangles(17, 18, 19, 0, 17, 19, 20, 0),
+    gsSP2Triangles(21, 22, 23, 0, 21, 23, 24, 0),
+    gsSP2Triangles(25, 26, 27, 0, 25, 27, 28, 0),
+    gsSP2Triangles(25, 29, 30, 0, 25, 30, 31, 0),
     gsSPVertex(0x040182F0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(0, 4, 5, 0, 6, 7, 8, 0),
     gsSP2Triangles(6, 8, 9, 0, 10, 11, 12, 0),
-    gsSP1Quadrangle(10, 13, 14, 15, 0),
+    gsSP2Triangles(10, 13, 14, 0, 10, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3830,23 +3830,23 @@ Gfx d_course_toads_turnpike_packed_dl_6908[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040183F0, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 3, 0),
-    gsSP1Quadrangle(7, 8, 9, 10, 0),
-    gsSP1Quadrangle(7, 11, 12, 13, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 3, 0),
+    gsSP2Triangles(7, 8, 9, 0, 7, 9, 10, 0),
+    gsSP2Triangles(7, 11, 12, 0, 7, 12, 13, 0),
     gsSP2Triangles(14, 15, 16, 0, 17, 18, 19, 0),
     gsSP2Triangles(17, 19, 20, 0, 21, 22, 23, 0),
     gsSP2Triangles(21, 23, 24, 0, 21, 25, 26, 0),
     gsSP2Triangles(21, 26, 27, 0, 28, 29, 30, 0),
     gsSPVertex(0x040185E0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(4, 8, 9, 10, 0),
-    gsSP1Quadrangle(11, 12, 13, 14, 0),
-    gsSP1Quadrangle(15, 16, 17, 18, 0),
-    gsSP1Quadrangle(15, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(22, 26, 27, 28, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(4, 8, 9, 0, 4, 9, 10, 0),
+    gsSP2Triangles(11, 12, 13, 0, 11, 13, 14, 0),
+    gsSP2Triangles(15, 16, 17, 0, 15, 17, 18, 0),
+    gsSP2Triangles(15, 19, 20, 0, 15, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(22, 26, 27, 0, 22, 27, 28, 0),
     gsSP1Triangle(29, 30, 31, 0),
     gsSPVertex(0x040187E0, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
@@ -3861,16 +3861,16 @@ Gfx d_course_toads_turnpike_packed_dl_6908[] =
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(3, 5, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(7, 9, 10, 0, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPVertex(0x04018BC0, 27, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSP2Triangles(20, 21, 22, 0, 23, 24, 25, 0),
     gsSP1Triangle(23, 25, 26, 0),
     gsSPEndDisplayList(),
diff --git a/courses/mushroom_cup/kalimari_desert/course_data.inc.c b/courses/mushroom_cup/kalimari_desert/course_data.inc.c
index 40e3843e9..8425241af 100644
--- a/courses/mushroom_cup/kalimari_desert/course_data.inc.c
+++ b/courses/mushroom_cup/kalimari_desert/course_data.inc.c
@@ -4590,9 +4590,9 @@ Gfx d_course_kalimari_desert_dl_cactus1[] =
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x00FC),
     gsDPLoadTextureBlock(0x03009000, G_IM_FMT_CI, G_IM_SIZ_8b, 32, 64, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD),
     gsSPVertex(d_course_kalimari_desert_cactus_model1, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPLoadTextureBlock(0x03009800, G_IM_FMT_CI, G_IM_SIZ_8b, 32, 64, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPEndDisplayList(),
 };
@@ -4609,9 +4609,9 @@ Gfx d_course_kalimari_desert_dl_cactus2[] =
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x00FC),
     gsDPLoadTextureBlock(0x0300A000, G_IM_FMT_CI, G_IM_SIZ_8b, 32, 64, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD),
     gsSPVertex(d_course_kalimari_desert_cactus_model1, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPLoadTextureBlock(0x0300A800, G_IM_FMT_CI, G_IM_SIZ_8b, 32, 64, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPEndDisplayList(),
 };
@@ -4628,7 +4628,7 @@ Gfx d_course_kalimari_desert_dl_cactus3[] =
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x00FC),
     gsDPLoadTextureBlock(0x0300B000, G_IM_FMT_CI, G_IM_SIZ_8b, 32, 64, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD),
     gsSPVertex(d_course_kalimari_desert_cactus_model2, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPEndDisplayList(),
 };
@@ -4775,28 +4775,28 @@ Gfx d_course_kalimari_desert_dl_crossing_right_active[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(d_course_kalimari_desert_crossing_signal_active_model, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, d_course_kalimari_desert_crossing_sign_inactive_bottom_left),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(d_course_kalimari_desert_crossing_signal_unknown_model1, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, d_course_kalimari_desert_crossing_sign_active_top_right),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(d_course_kalimari_desert_crossing_signal_unknown_model2, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, d_course_kalimari_desert_crossing_sign_active_bottom_right),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(d_course_kalimari_desert_crossing_signal_unknown_model3, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4816,28 +4816,28 @@ Gfx d_course_kalimari_desert_dl_crossing_left_active[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(d_course_kalimari_desert_crossing_signal_unknown_model4, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, d_course_kalimari_desert_crossing_sign_inactive_bottom_right),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(d_course_kalimari_desert_crossing_signal_unknown_model5, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, d_course_kalimari_desert_crossing_sign_active_top_left),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(d_course_kalimari_desert_crossing_signal_unknown_model6, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, d_course_kalimari_desert_crossing_sign_active_bottom_left),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(d_course_kalimari_desert_crossing_signal_unknown_model7, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4857,28 +4857,28 @@ Gfx d_course_kalimari_desert_dl_crossing_both_inactive[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(d_course_kalimari_desert_crossing_signal_unknown_model8, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, d_course_kalimari_desert_crossing_sign_inactive_top_right),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(d_course_kalimari_desert_crossing_signal_unknown_model9, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, d_course_kalimari_desert_crossing_sign_inactive_bottom_left),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(d_course_kalimari_desert_crossing_signal_unknown_model10, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, d_course_kalimari_desert_crossing_sign_inactive_bottom_right),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(d_course_kalimari_desert_crossing_signal_unknown_model11, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5434,7 +5434,7 @@ Gfx d_course_kalimari_desert_dl_1B7C0[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_kalimari_desert_locomotive_model_lod2, 10, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
     gsSPEndDisplayList(),
 };
@@ -5458,8 +5458,8 @@ Gfx d_course_kalimari_desert_dl_1B850[] =
     gsSPClearGeometryMode(G_LIGHTING),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPVertex(d_course_kalimari_desert_unknown_lod2_locomotive_model1, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 6, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x00FC),
@@ -5469,8 +5469,8 @@ Gfx d_course_kalimari_desert_dl_1B850[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(d_course_kalimari_desert_unknown_lod2_locomotive_model2, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPSetGeometryMode(G_CULL_BACK),
     gsSPEndDisplayList(),
 };
@@ -5502,32 +5502,32 @@ Gfx d_course_kalimari_desert_dl_1B990[] =
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_kalimari_desert_unknown_lod2_locomotive_model3, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 6, 0),
-    gsSP1Quadrangle(1, 6, 7, 8, 0),
-    gsSP1Quadrangle(1, 8, 9, 2, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 10, 13, 0),
-    gsSP1Quadrangle(12, 11, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 19, 18, 23, 0),
-    gsSP1Quadrangle(20, 15, 14, 21, 0),
-    gsSP1Quadrangle(24, 25, 22, 23, 0),
-    gsSP1Quadrangle(16, 25, 24, 17, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 6, 0),
+    gsSP2Triangles(1, 6, 7, 0, 1, 7, 8, 0),
+    gsSP2Triangles(1, 8, 9, 0, 1, 9, 2, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 10, 0, 14, 10, 13, 0),
+    gsSP2Triangles(12, 11, 16, 0, 12, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 19, 18, 0, 22, 18, 23, 0),
+    gsSP2Triangles(20, 15, 14, 0, 20, 14, 21, 0),
+    gsSP2Triangles(24, 25, 22, 0, 24, 22, 23, 0),
+    gsSP2Triangles(16, 25, 24, 0, 16, 24, 17, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPVertex(d_course_kalimari_desert_unknown_lod2_locomotive_model4, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 13, 12, 17, 0),
-    gsSP1Quadrangle(14, 18, 19, 15, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(19, 18, 20, 23, 0),
-    gsSP1Quadrangle(22, 21, 24, 25, 0),
-    gsSP1Quadrangle(24, 26, 27, 25, 0),
-    gsSP1Quadrangle(27, 26, 16, 17, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 13, 12, 0, 16, 12, 17, 0),
+    gsSP2Triangles(14, 18, 19, 0, 14, 19, 15, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(19, 18, 20, 0, 19, 20, 23, 0),
+    gsSP2Triangles(22, 21, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(24, 26, 27, 0, 24, 27, 25, 0),
+    gsSP2Triangles(27, 26, 16, 0, 27, 16, 17, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(d_course_kalimari_desert_unknown_lod2_locomotive_model5, 30, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 0, 0),
     gsSP2Triangles(3, 0, 2, 0, 1, 5, 2, 0),
@@ -5537,12 +5537,12 @@ Gfx d_course_kalimari_desert_dl_1B990[] =
     gsSP2Triangles(10, 4, 3, 0, 12, 11, 13, 0),
     gsSP2Triangles(7, 14, 8, 0, 14, 15, 13, 0),
     gsSP2Triangles(14, 13, 8, 0, 15, 12, 13, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 20, 23, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 20, 0, 24, 20, 23, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPVertex(d_course_kalimari_desert_unknown_lod2_locomotive_model6, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPPipeSync(),
     gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
@@ -5558,19 +5558,19 @@ Gfx d_course_kalimari_desert_dl_1B990[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPVertex(d_course_kalimari_desert_unknown_lod2_locomotive_model7, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
     gsSP2Triangles(6, 7, 8, 0, 7, 9, 8, 0),
     gsSP2Triangles(10, 11, 12, 0, 13, 10, 12, 0),
     gsSP2Triangles(14, 15, 12, 0, 15, 16, 12, 0),
     gsSP2Triangles(17, 18, 12, 0, 18, 19, 12, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 20, 23, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
-    gsSP1Quadrangle(28, 30, 31, 29, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 20, 0, 24, 20, 23, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
+    gsSP2Triangles(28, 30, 31, 0, 28, 31, 29, 0),
     gsSPVertex(d_course_kalimari_desert_unknown_lod2_locomotive_model8, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -5581,8 +5581,8 @@ Gfx d_course_kalimari_desert_dl_1B990[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPVertex(d_course_kalimari_desert_unknown_lod2_locomotive_model9, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(0, 3, 4, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, d_course_kalimari_desert_locomotive_lamp),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
@@ -5590,7 +5590,7 @@ Gfx d_course_kalimari_desert_dl_1B990[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPVertex(d_course_kalimari_desert_unknown_lod2_locomotive_model10, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -5600,15 +5600,15 @@ Gfx d_course_kalimari_desert_dl_1B990[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(d_course_kalimari_desert_unknown_lod2_locomotive_model11, 28, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(5, 8, 9, 6, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 10, 13, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(17, 20, 21, 18, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(23, 26, 27, 24, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(5, 8, 9, 0, 5, 9, 6, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 10, 0, 14, 10, 13, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(17, 20, 21, 0, 17, 21, 18, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(23, 26, 27, 0, 23, 27, 24, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5619,8 +5619,8 @@ Gfx d_course_kalimari_desert_dl_1BD18[] =
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_kalimari_desert_unknown_lod2_locomotive_model12, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 0, 3, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 0, 3, 0, 4, 3, 5, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5631,9 +5631,9 @@ Gfx d_course_kalimari_desert_dl_1BD58[] =
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_kalimari_desert_unknown_lod2_locomotive_model13, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSP1Triangle(8, 11, 11, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPPipeSync(),
@@ -5649,34 +5649,34 @@ Gfx d_course_kalimari_desert_dl_1BD58[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(d_course_kalimari_desert_unknown_lod2_locomotive_model14, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(13, 12, 14, 15, 0),
-    gsSP1Quadrangle(16, 10, 13, 17, 0),
-    gsSP1Quadrangle(18, 19, 17, 20, 0),
-    gsSP1Quadrangle(19, 21, 16, 17, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 22, 25, 27, 0),
-    gsSP1Quadrangle(25, 24, 28, 29, 0),
-    gsSP1Quadrangle(27, 25, 29, 30, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(13, 12, 14, 0, 13, 14, 15, 0),
+    gsSP2Triangles(16, 10, 13, 0, 16, 13, 17, 0),
+    gsSP2Triangles(18, 19, 17, 0, 18, 17, 20, 0),
+    gsSP2Triangles(19, 21, 16, 0, 19, 16, 17, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 22, 25, 0, 26, 25, 27, 0),
+    gsSP2Triangles(25, 24, 28, 0, 25, 28, 29, 0),
+    gsSP2Triangles(27, 25, 29, 0, 27, 29, 30, 0),
     gsSPVertex(d_course_kalimari_desert_unknown_lod2_locomotive_model15, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(14, 16, 17, 15, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(19, 22, 23, 20, 0),
-    gsSP1Quadrangle(24, 25, 18, 21, 0),
-    gsSP1Quadrangle(16, 26, 27, 17, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(14, 16, 17, 0, 14, 17, 15, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(19, 22, 23, 0, 19, 23, 20, 0),
+    gsSP2Triangles(24, 25, 18, 0, 24, 18, 21, 0),
+    gsSP2Triangles(16, 26, 27, 0, 16, 27, 17, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(d_course_kalimari_desert_unknown_lod2_locomotive_model16, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5687,19 +5687,19 @@ Gfx d_course_kalimari_desert_dl_1BEF8[] =
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_kalimari_desert_unknown_lod2_locomotive_model17, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(7, 6, 0, 3, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(7, 6, 0, 0, 7, 0, 3, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(d_course_kalimari_desert_unknown_lod2_locomotive_model18, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5711,34 +5711,34 @@ Gfx d_course_kalimari_desert_dl_1BF90[] =
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_kalimari_desert_unknown_lod2_locomotive_model19, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 0, 3, 5, 0),
-    gsSP1Quadrangle(1, 6, 7, 2, 0),
-    gsSP1Quadrangle(2, 8, 9, 3, 0),
-    gsSP1Quadrangle(3, 9, 10, 5, 0),
-    gsSP1Quadrangle(8, 11, 12, 9, 0),
-    gsSP1Quadrangle(13, 8, 2, 7, 0),
-    gsSP1Quadrangle(14, 11, 8, 13, 0),
-    gsSP1Quadrangle(9, 12, 15, 10, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 0, 3, 0, 4, 3, 5, 0),
+    gsSP2Triangles(1, 6, 7, 0, 1, 7, 2, 0),
+    gsSP2Triangles(2, 8, 9, 0, 2, 9, 3, 0),
+    gsSP2Triangles(3, 9, 10, 0, 3, 10, 5, 0),
+    gsSP2Triangles(8, 11, 12, 0, 8, 12, 9, 0),
+    gsSP2Triangles(13, 8, 2, 0, 13, 2, 7, 0),
+    gsSP2Triangles(14, 11, 8, 0, 14, 8, 13, 0),
+    gsSP2Triangles(9, 12, 15, 0, 9, 15, 10, 0),
     gsSP2Triangles(6, 16, 7, 0, 16, 14, 13, 0),
     gsSP2Triangles(16, 13, 7, 0, 10, 15, 17, 0),
     gsSP2Triangles(10, 17, 5, 0, 4, 5, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
     gsSP2Triangles(22, 19, 18, 0, 23, 24, 25, 0),
     gsSP2Triangles(26, 25, 24, 0, 27, 26, 24, 0),
     gsSP1Triangle(28, 29, 30, 0),
     gsSPVertex(d_course_kalimari_desert_unknown_lod2_locomotive_model20, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(6, 8, 7, 0, 9, 10, 11, 0),
     gsSP2Triangles(9, 11, 0, 0, 12, 13, 14, 0),
-    gsSP1Quadrangle(15, 16, 17, 18, 0),
-    gsSP1Quadrangle(19, 20, 21, 22, 0),
+    gsSP2Triangles(15, 16, 17, 0, 15, 17, 18, 0),
+    gsSP2Triangles(19, 20, 21, 0, 19, 21, 22, 0),
     gsSP2Triangles(23, 12, 14, 0, 24, 25, 26, 0),
     gsSP2Triangles(24, 26, 27, 0, 28, 29, 30, 0),
     gsSP1Triangle(28, 30, 31, 0),
     gsSPVertex(d_course_kalimari_desert_unknown_lod2_locomotive_model21, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPSetGeometryMode(G_CULL_BACK),
     gsSPEndDisplayList(),
 };
@@ -6064,7 +6064,7 @@ Gfx d_course_kalimari_desert_dl_1CFA8[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_kalimari_desert_locomotive_model_lod1, 10, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
     gsSPEndDisplayList(),
 };
@@ -6088,8 +6088,8 @@ Gfx d_course_kalimari_desert_dl_1D038[] =
     gsSPClearGeometryMode(G_LIGHTING),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPVertex(d_course_kalimari_desert_unknown_lod1_locomotive_model1, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 6, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x00FC),
@@ -6099,8 +6099,8 @@ Gfx d_course_kalimari_desert_dl_1D038[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(d_course_kalimari_desert_unknown_lod1_locomotive_model2, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPSetGeometryMode(G_CULL_BACK),
     gsSPEndDisplayList(),
 };
@@ -6132,29 +6132,29 @@ Gfx d_course_kalimari_desert_dl_1D178[] =
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_kalimari_desert_unknown_lod1_locomotive_model3, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 3, 2, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 8, 7, 0),
-    gsSP1Quadrangle(0, 6, 9, 1, 0),
-    gsSP1Quadrangle(11, 10, 4, 5, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 12, 15, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 18, 21, 0),
-    gsSP1Quadrangle(24, 23, 22, 25, 0),
-    gsSP1Quadrangle(19, 24, 25, 20, 0),
-    gsSP1Quadrangle(26, 17, 16, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 3, 2, 0, 4, 2, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 8, 0, 10, 8, 7, 0),
+    gsSP2Triangles(0, 6, 9, 0, 0, 9, 1, 0),
+    gsSP2Triangles(11, 10, 4, 0, 11, 4, 5, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 12, 0, 16, 12, 15, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 18, 0, 22, 18, 21, 0),
+    gsSP2Triangles(24, 23, 22, 0, 24, 22, 25, 0),
+    gsSP2Triangles(19, 24, 25, 0, 19, 25, 20, 0),
+    gsSP2Triangles(26, 17, 16, 0, 26, 16, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(d_course_kalimari_desert_unknown_lod1_locomotive_model4, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 12, 15, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 12, 0, 16, 12, 15, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPPipeSync(),
     gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
@@ -6170,10 +6170,10 @@ Gfx d_course_kalimari_desert_dl_1D178[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPVertex(d_course_kalimari_desert_unknown_lod1_locomotive_model5, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 6, 9, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 6, 0, 10, 6, 9, 0),
     gsSP2Triangles(12, 13, 14, 0, 15, 12, 14, 0),
     gsSP2Triangles(16, 17, 18, 0, 17, 19, 18, 0),
     gsDPTileSync(),
@@ -6186,8 +6186,8 @@ Gfx d_course_kalimari_desert_dl_1D178[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPVertex(d_course_kalimari_desert_unknown_lod1_locomotive_model6, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(0, 3, 4, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, d_course_kalimari_desert_locomotive_lamp),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
@@ -6195,7 +6195,7 @@ Gfx d_course_kalimari_desert_dl_1D178[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPVertex(d_course_kalimari_desert_unknown_lod1_locomotive_model7, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -6205,11 +6205,11 @@ Gfx d_course_kalimari_desert_dl_1D178[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(d_course_kalimari_desert_unknown_lod1_locomotive_model8, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6220,7 +6220,7 @@ Gfx d_course_kalimari_desert_dl_1D418[] =
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_kalimari_desert_unknown_lod1_locomotive_model9, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6231,8 +6231,8 @@ Gfx d_course_kalimari_desert_dl_1D450[] =
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_kalimari_desert_unknown_lod1_locomotive_model10, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPPipeSync(),
     gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
@@ -6247,14 +6247,14 @@ Gfx d_course_kalimari_desert_dl_1D450[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(d_course_kalimari_desert_unknown_lod1_locomotive_model11, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(19, 18, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(19, 18, 20, 0, 19, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6265,11 +6265,11 @@ Gfx d_course_kalimari_desert_dl_1D540[] =
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_kalimari_desert_unknown_lod1_locomotive_model12, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6281,13 +6281,13 @@ Gfx d_course_kalimari_desert_dl_1D598[] =
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_kalimari_desert_unknown_lod1_locomotive_model13, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(6, 5, 8, 9, 0),
-    gsSP1Quadrangle(9, 8, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(6, 5, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(9, 8, 10, 0, 9, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSP2Triangles(24, 25, 26, 0, 27, 28, 29, 0),
     gsSP1Triangle(27, 29, 30, 0),
     gsSPVertex(d_course_kalimari_desert_unknown_lod1_locomotive_model14, 3, 0),
@@ -6576,7 +6576,7 @@ Gfx d_course_kalimari_desert_dl_1E2C8[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_kalimari_desert_locomotive_model_lod0, 10, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
     gsSPEndDisplayList(),
 };
@@ -6600,8 +6600,8 @@ Gfx d_course_kalimari_desert_dl_1E358[] =
     gsSPClearGeometryMode(G_LIGHTING),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPVertex(d_course_kalimari_desert_unknown_lod0_locomotive_model1, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 6, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x00FC),
@@ -6611,8 +6611,8 @@ Gfx d_course_kalimari_desert_dl_1E358[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(d_course_kalimari_desert_unknown_lod0_locomotive_model2, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPSetGeometryMode(G_CULL_BACK),
     gsSPEndDisplayList(),
 };
@@ -6644,21 +6644,21 @@ Gfx d_course_kalimari_desert_dl_1E498[] =
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_kalimari_desert_unknown_lod0_locomotive_model3, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 2, 1, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 2, 0, 4, 2, 1, 0),
     gsSP2Triangles(6, 7, 8, 0, 4, 9, 10, 0),
     gsSP2Triangles(4, 10, 5, 0, 0, 3, 10, 0),
     gsSP2Triangles(0, 10, 9, 0, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
-    gsSP1Quadrangle(20, 19, 30, 31, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
+    gsSP2Triangles(20, 19, 30, 0, 20, 30, 31, 0),
     gsSPVertex(d_course_kalimari_desert_unknown_lod0_locomotive_model4, 14, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPPipeSync(),
     gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
@@ -6674,10 +6674,10 @@ Gfx d_course_kalimari_desert_dl_1E498[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPVertex(d_course_kalimari_desert_unknown_lod0_locomotive_model5, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 0, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(8, 10, 11, 9, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 0, 0, 4, 0, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -6688,7 +6688,7 @@ Gfx d_course_kalimari_desert_dl_1E498[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPVertex(d_course_kalimari_desert_unknown_lod0_locomotive_model6, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, d_course_kalimari_desert_locomotive_lamp),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
@@ -6696,7 +6696,7 @@ Gfx d_course_kalimari_desert_dl_1E498[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPVertex(d_course_kalimari_desert_unknown_lod0_locomotive_model7, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -6706,10 +6706,10 @@ Gfx d_course_kalimari_desert_dl_1E498[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(d_course_kalimari_desert_unknown_lod0_locomotive_model8, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6720,7 +6720,7 @@ Gfx d_course_kalimari_desert_dl_1E6D8[] =
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_kalimari_desert_unknown_lod0_locomotive_model9, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6731,8 +6731,8 @@ Gfx d_course_kalimari_desert_dl_1E710[] =
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_kalimari_desert_unknown_lod0_locomotive_model10, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPPipeSync(),
     gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
@@ -6747,14 +6747,14 @@ Gfx d_course_kalimari_desert_dl_1E710[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(d_course_kalimari_desert_unknown_lod0_locomotive_model11, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(19, 18, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(19, 18, 20, 0, 19, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6765,11 +6765,11 @@ Gfx d_course_kalimari_desert_dl_1E800[] =
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_kalimari_desert_unknown_lod0_locomotive_model12, 19, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 1, 5, 6, 0),
-    gsSP1Quadrangle(7, 8, 9, 10, 0),
-    gsSP1Quadrangle(11, 12, 13, 14, 0),
-    gsSP1Quadrangle(15, 16, 17, 18, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 1, 5, 0, 4, 5, 6, 0),
+    gsSP2Triangles(7, 8, 9, 0, 7, 9, 10, 0),
+    gsSP2Triangles(11, 12, 13, 0, 11, 13, 14, 0),
+    gsSP2Triangles(15, 16, 17, 0, 15, 17, 18, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6781,12 +6781,12 @@ Gfx d_course_kalimari_desert_dl_1E858[] =
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_kalimari_desert_unknown_lod0_locomotive_model13, 27, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(6, 5, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(6, 5, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
     gsSP2Triangles(22, 23, 24, 0, 25, 22, 26, 0),
     gsSPSetGeometryMode(G_CULL_BACK),
     gsSPEndDisplayList(),
@@ -6946,15 +6946,15 @@ Gfx d_course_kalimari_desert_dl_1EFD8[] =
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_kalimari_desert_tender_model_lod2, 28, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 0, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 3, 2, 0),
-    gsSP1Quadrangle(5, 4, 7, 6, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 0, 4, 0, 1, 4, 5, 0),
+    gsSP2Triangles(6, 7, 3, 0, 6, 3, 2, 0),
+    gsSP2Triangles(5, 4, 7, 0, 5, 7, 6, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6965,17 +6965,17 @@ Gfx d_course_kalimari_desert_dl_1F050[] =
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_kalimari_desert_unknown_lod2_tender_model1, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 2, 1, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
-    gsSP1Quadrangle(27, 26, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 2, 1, 0, 4, 1, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
+    gsSP2Triangles(27, 26, 30, 0, 27, 30, 31, 0),
     gsSPVertex(d_course_kalimari_desert_unknown_lod2_tender_model2, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6999,10 +6999,10 @@ Gfx d_course_kalimari_desert_dl_1F0D8[] =
     gsSPVertex(d_course_kalimari_desert_unknown_lod2_tender_model3, 27, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(3, 5, 6, 0, 7, 1, 8, 0),
-    gsSP1Quadrangle(9, 10, 11, 12, 0),
+    gsSP2Triangles(9, 10, 11, 0, 9, 11, 12, 0),
     gsSP2Triangles(13, 14, 15, 0, 16, 17, 18, 0),
     gsSP2Triangles(16, 18, 19, 0, 20, 21, 22, 0),
-    gsSP1Quadrangle(23, 24, 25, 26, 0),
+    gsSP2Triangles(23, 24, 25, 0, 23, 25, 26, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 6, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x007C),
@@ -7012,10 +7012,10 @@ Gfx d_course_kalimari_desert_dl_1F0D8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(d_course_kalimari_desert_unknown_lod2_tender_model4, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7109,14 +7109,14 @@ Gfx d_course_kalimari_desert_dl_1F570[] =
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_kalimari_desert_tender_model_lod1, 23, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 1, 0, 0),
-    gsSP1Quadrangle(6, 7, 3, 2, 0),
-    gsSP1Quadrangle(7, 6, 5, 4, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 10, 13, 14, 0),
-    gsSP1Quadrangle(15, 16, 17, 18, 0),
-    gsSP1Quadrangle(19, 20, 21, 22, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0),
+    gsSP2Triangles(6, 7, 3, 0, 6, 3, 2, 0),
+    gsSP2Triangles(7, 6, 5, 0, 7, 5, 4, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 10, 13, 0, 12, 13, 14, 0),
+    gsSP2Triangles(15, 16, 17, 0, 15, 17, 18, 0),
+    gsSP2Triangles(19, 20, 21, 0, 19, 21, 22, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7149,10 +7149,10 @@ Gfx d_course_kalimari_desert_dl_1F5E0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(d_course_kalimari_desert_unknown_lod1_tender_model2, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7237,10 +7237,10 @@ Gfx d_course_kalimari_desert_dl_1F988[] =
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_kalimari_desert_tender_model_lod0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7272,10 +7272,10 @@ Gfx d_course_kalimari_desert_dl_1F9D8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(d_course_kalimari_desert_unknown_lod0_tender_model2, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7522,9 +7522,9 @@ Gfx d_course_kalimari_desert_dl_20578[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_kalimari_desert_carriage_chassis_model_lod2, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7547,11 +7547,11 @@ Gfx d_course_kalimari_desert_dl_20630[] =
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_kalimari_desert_unknown_lod2_carriage_chassis_model1, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7562,7 +7562,7 @@ Gfx d_course_kalimari_desert_dl_20688[] =
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_kalimari_desert_unknown_lod2_carriage_chassis_model2, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(3, 2, 4, 0, 5, 6, 4, 0),
     gsSP2Triangles(5, 4, 7, 0, 1, 6, 5, 0),
     gsSP2Triangles(1, 5, 8, 0, 5, 9, 8, 0),
@@ -7578,7 +7578,7 @@ Gfx d_course_kalimari_desert_dl_20688[] =
     gsSP1Triangle(16, 30, 31, 0),
     gsSPVertex(d_course_kalimari_desert_unknown_lod2_carriage_chassis_model3, 15, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 0, 0),
-    gsSP1Quadrangle(3, 0, 2, 5, 0),
+    gsSP2Triangles(3, 0, 2, 0, 3, 2, 5, 0),
     gsSP2Triangles(3, 5, 6, 0, 7, 3, 6, 0),
     gsSP2Triangles(7, 6, 8, 0, 9, 10, 11, 0),
     gsSP2Triangles(9, 11, 12, 0, 10, 13, 14, 0),
@@ -7598,8 +7598,8 @@ Gfx d_course_kalimari_desert_dl_20688[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPVertex(d_course_kalimari_desert_unknown_lod2_carriage_chassis_model4, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 6, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x00FC),
@@ -7610,7 +7610,7 @@ Gfx d_course_kalimari_desert_dl_20688[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPVertex(d_course_kalimari_desert_unknown_lod2_carriage_chassis_model5, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 6, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x00FC),
@@ -7620,9 +7620,9 @@ Gfx d_course_kalimari_desert_dl_20688[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(d_course_kalimari_desert_unknown_lod2_carriage_chassis_model6, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7633,17 +7633,17 @@ Gfx d_course_kalimari_desert_dl_208A0[] =
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_kalimari_desert_unknown_lod2_carriage_chassis_model7, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 2, 1, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
-    gsSP1Quadrangle(27, 26, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 2, 1, 0, 4, 1, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
+    gsSP2Triangles(27, 26, 30, 0, 27, 30, 31, 0),
     gsSPVertex(d_course_kalimari_desert_unknown_lod2_carriage_chassis_model8, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7654,11 +7654,11 @@ Gfx d_course_kalimari_desert_dl_20928[] =
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_kalimari_desert_unknown_lod2_carriage_chassis_model9, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7669,8 +7669,8 @@ Gfx d_course_kalimari_desert_dl_20980[] =
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_kalimari_desert_unknown_lod2_carriage_chassis_model10, 7, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(0, 3, 4, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0),
     gsSP1Triangle(0, 5, 6, 0),
     gsSPEndDisplayList(),
 };
@@ -7867,7 +7867,7 @@ Gfx d_course_kalimari_desert_dl_21178[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_kalimari_desert_carriage_chassis_model_lod1, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7897,10 +7897,10 @@ Gfx d_course_kalimari_desert_dl_21238[] =
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_kalimari_desert_unknown_lod1_carriage_chassis_model1, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7911,19 +7911,19 @@ Gfx d_course_kalimari_desert_dl_21288[] =
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_kalimari_desert_unknown_lod1_carriage_chassis_model2, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(1, 0, 5, 4, 0),
-    gsSP1Quadrangle(3, 2, 7, 6, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(13, 16, 17, 14, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(1, 0, 5, 0, 1, 5, 4, 0),
+    gsSP2Triangles(3, 2, 7, 0, 3, 7, 6, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(13, 16, 17, 0, 13, 17, 14, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSP1Triangle(27, 30, 31, 0),
     gsSPVertex(d_course_kalimari_desert_unknown_lod1_carriage_chassis_model3, 17, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(0, 3, 4, 0, 5, 6, 7, 0),
     gsSP2Triangles(5, 7, 8, 0, 9, 10, 11, 0),
     gsSP2Triangles(9, 11, 12, 0, 13, 14, 15, 0),
@@ -7943,8 +7943,8 @@ Gfx d_course_kalimari_desert_dl_21288[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPVertex(d_course_kalimari_desert_unknown_lod1_carriage_chassis_model4, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 6, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x00FC),
@@ -7955,7 +7955,7 @@ Gfx d_course_kalimari_desert_dl_21288[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPVertex(d_course_kalimari_desert_unknown_lod1_carriage_chassis_model5, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 6, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x00FC),
@@ -7965,9 +7965,9 @@ Gfx d_course_kalimari_desert_dl_21288[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(d_course_kalimari_desert_unknown_lod1_carriage_chassis_model6, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7978,10 +7978,10 @@ Gfx d_course_kalimari_desert_dl_21480[] =
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_kalimari_desert_unknown_lod1_carriage_chassis_model7, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7992,8 +7992,8 @@ Gfx d_course_kalimari_desert_dl_214D0[] =
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_kalimari_desert_unknown_lod1_carriage_chassis_model8, 7, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(0, 3, 4, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0),
     gsSP1Triangle(0, 5, 6, 0),
     gsSPEndDisplayList(),
 };
@@ -8128,7 +8128,7 @@ Gfx d_course_kalimari_desert_dl_219D8[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_kalimari_desert_carriage_model_lod0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -8158,10 +8158,10 @@ Gfx d_course_kalimari_desert_dl_21A98[] =
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_kalimari_desert_unknown_lod0_carriage_model1, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -8172,10 +8172,10 @@ Gfx d_course_kalimari_desert_dl_21AE8[] =
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_kalimari_desert_unknown_lod0_carriage_model2, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPPipeSync(),
     gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
@@ -8190,9 +8190,9 @@ Gfx d_course_kalimari_desert_dl_21AE8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(d_course_kalimari_desert_unknown_lod0_carriage_model3, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -8203,10 +8203,10 @@ Gfx d_course_kalimari_desert_dl_21BC0[] =
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_kalimari_desert_unknown_lod0_carriage_model4, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -8217,8 +8217,8 @@ Gfx d_course_kalimari_desert_dl_21C10[] =
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_kalimari_desert_unknown_lod0_carriage_model5, 7, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(0, 3, 4, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0),
     gsSP1Triangle(0, 5, 6, 0),
     gsSPEndDisplayList(),
 };
@@ -8286,9 +8286,9 @@ Gfx d_course_kalimari_desert_dl_22D70[] =
     gsDPSetCombineMode(G_CC_MODULATEIDECALA, G_CC_MODULATEIDECALA),
     gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2),
     gsSPVertex(d_course_kalimari_desert_unknown_model1, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetRenderMode(G_RM_AA_ZB_XLU_DECAL, G_RM_AA_ZB_XLU_DECAL2),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -8299,9 +8299,9 @@ Gfx d_course_kalimari_desert_dl_22DB8[] =
     gsDPSetCombineMode(G_CC_MODULATEIDECALA, G_CC_MODULATEIDECALA),
     gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2),
     gsSPVertex(d_course_kalimari_desert_unknown_model2, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetRenderMode(G_RM_AA_ZB_XLU_DECAL, G_RM_AA_ZB_XLU_DECAL2),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
diff --git a/courses/mushroom_cup/kalimari_desert/packed.inc.c b/courses/mushroom_cup/kalimari_desert/packed.inc.c
index c6e85485d..8a5a8cb20 100644
--- a/courses/mushroom_cup/kalimari_desert/packed.inc.c
+++ b/courses/mushroom_cup/kalimari_desert/packed.inc.c
@@ -17,8 +17,8 @@ Gfx d_course_kalimari_desert_packed_dl_0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000000, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -34,8 +34,8 @@ Gfx d_course_kalimari_desert_packed_dl_68[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000080, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -51,8 +51,8 @@ Gfx d_course_kalimari_desert_packed_dl_D0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000100, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -68,8 +68,8 @@ Gfx d_course_kalimari_desert_packed_dl_138[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000180, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -85,8 +85,8 @@ Gfx d_course_kalimari_desert_packed_dl_1A0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000200, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -102,8 +102,8 @@ Gfx d_course_kalimari_desert_packed_dl_208[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000280, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -130,17 +130,17 @@ Gfx d_course_kalimari_desert_packed_dl_2A8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04000300, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04000500, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -156,12 +156,12 @@ Gfx d_course_kalimari_desert_packed_dl_358[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04000580, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -177,10 +177,10 @@ Gfx d_course_kalimari_desert_packed_dl_3E0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04000700, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -196,23 +196,23 @@ Gfx d_course_kalimari_desert_packed_dl_458[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04000800, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 0, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(8, 10, 11, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(14, 16, 17, 15, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(20, 22, 23, 21, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(26, 28, 29, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 0, 0, 4, 0, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(14, 16, 17, 0, 14, 17, 15, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(26, 28, 29, 0, 26, 29, 27, 0),
     gsSPVertex(0x040009E0, 18, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 6, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 12, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 6, 0, 10, 6, 9, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 12, 0, 16, 12, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -228,19 +228,19 @@ Gfx d_course_kalimari_desert_packed_dl_538[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04000B00, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 0, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(8, 10, 11, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(14, 16, 17, 15, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(20, 22, 23, 21, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(26, 28, 29, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 0, 0, 4, 0, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(14, 16, 17, 0, 14, 17, 15, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(26, 28, 29, 0, 26, 29, 27, 0),
     gsSPVertex(0x04000CE0, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -256,16 +256,16 @@ Gfx d_course_kalimari_desert_packed_dl_5F8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04000D40, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(8, 10, 11, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(14, 16, 17, 15, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 18, 21, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(14, 16, 17, 0, 14, 17, 15, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 18, 0, 22, 18, 21, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -281,19 +281,19 @@ Gfx d_course_kalimari_desert_packed_dl_6A0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04000F40, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 0, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(8, 10, 11, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(14, 16, 17, 15, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(20, 22, 23, 21, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(26, 28, 29, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 0, 0, 4, 0, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(14, 16, 17, 0, 14, 17, 15, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(26, 28, 29, 0, 26, 29, 27, 0),
     gsSPVertex(0x04001120, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -309,23 +309,23 @@ Gfx d_course_kalimari_desert_packed_dl_760[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04001180, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 0, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(8, 10, 11, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(14, 16, 17, 15, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(20, 22, 23, 21, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(26, 28, 29, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 0, 0, 4, 0, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(14, 16, 17, 0, 14, 17, 15, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(26, 28, 29, 0, 26, 29, 27, 0),
     gsSPVertex(0x04001360, 18, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 6, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 12, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 6, 0, 10, 6, 9, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 12, 0, 16, 12, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -341,19 +341,19 @@ Gfx d_course_kalimari_desert_packed_dl_840[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04001480, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 0, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(8, 10, 11, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(14, 16, 17, 15, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(20, 22, 23, 21, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(26, 28, 29, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 0, 0, 4, 0, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(14, 16, 17, 0, 14, 17, 15, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(26, 28, 29, 0, 26, 29, 27, 0),
     gsSPVertex(0x04001660, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -369,14 +369,14 @@ Gfx d_course_kalimari_desert_packed_dl_900[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040016C0, 28, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 0, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(24, 26, 27, 25, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 0, 0, 4, 0, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(24, 26, 27, 0, 24, 27, 25, 0),
     gsSPEndDisplayList(),
 };
 
@@ -605,7 +605,7 @@ Gfx d_course_kalimari_desert_packed_dl_E80[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04001E10, 10, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
     gsSPEndDisplayList(),
 };
@@ -787,7 +787,7 @@ Gfx d_course_kalimari_desert_packed_dl_12F0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04002500, 19, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(10, 11, 12, 0, 13, 14, 15, 0),
     gsSP1Triangle(16, 17, 18, 0),
@@ -865,7 +865,7 @@ Gfx d_course_kalimari_desert_packed_dl_14A0[] =
     gsSP2Triangles(0, 1, 2, 0, 3, 1, 0, 0),
     gsSP2Triangles(4, 5, 6, 0, 4, 7, 5, 0),
     gsSP2Triangles(8, 9, 10, 0, 8, 11, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -893,7 +893,7 @@ Gfx d_course_kalimari_desert_packed_dl_1580[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04002C30, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 4, 7, 5, 0),
     gsSP2Triangles(8, 9, 10, 0, 10, 11, 8, 0),
     gsSPEndDisplayList(),
@@ -920,14 +920,14 @@ Gfx d_course_kalimari_desert_packed_dl_1678[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04002CF0, 28, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSP2Triangles(16, 17, 10, 0, 18, 19, 13, 0),
-    gsSP1Quadrangle(17, 16, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 19, 18, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(17, 16, 20, 0, 17, 20, 21, 0),
+    gsSP2Triangles(22, 23, 19, 0, 22, 19, 18, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSPEndDisplayList(),
 };
 
@@ -943,44 +943,44 @@ Gfx d_course_kalimari_desert_packed_dl_1710[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04002EB0, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 0, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(8, 10, 11, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(14, 16, 17, 15, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(20, 22, 23, 21, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 24, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 0, 0, 4, 0, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(14, 16, 17, 0, 14, 17, 15, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 24, 0, 28, 24, 27, 0),
     gsSPVertex(0x04003090, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 6, 9, 0),
-    gsSP1Quadrangle(12, 13, 7, 6, 0),
-    gsSP1Quadrangle(9, 8, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 15, 18, 0),
-    gsSP1Quadrangle(17, 10, 9, 15, 0),
-    gsSP1Quadrangle(15, 14, 19, 18, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(21, 24, 25, 22, 0),
-    gsSP1Quadrangle(25, 26, 27, 22, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 6, 0, 10, 6, 9, 0),
+    gsSP2Triangles(12, 13, 7, 0, 12, 7, 6, 0),
+    gsSP2Triangles(9, 8, 14, 0, 9, 14, 15, 0),
+    gsSP2Triangles(16, 17, 15, 0, 16, 15, 18, 0),
+    gsSP2Triangles(17, 10, 9, 0, 17, 9, 15, 0),
+    gsSP2Triangles(15, 14, 19, 0, 15, 19, 18, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(21, 24, 25, 0, 21, 25, 22, 0),
+    gsSP2Triangles(25, 26, 27, 0, 25, 27, 22, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04003290, 29, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 2, 0),
-    gsSP1Quadrangle(1, 7, 4, 2, 0),
-    gsSP1Quadrangle(8, 9, 5, 4, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 14, 17, 19, 0),
-    gsSP1Quadrangle(16, 20, 21, 17, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(23, 18, 19, 24, 0),
-    gsSP1Quadrangle(24, 26, 27, 25, 0),
-    gsSP1Quadrangle(19, 28, 26, 24, 0),
-    gsSP1Quadrangle(17, 21, 28, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 2, 0),
+    gsSP2Triangles(1, 7, 4, 0, 1, 4, 2, 0),
+    gsSP2Triangles(8, 9, 5, 0, 8, 5, 4, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 14, 17, 0, 18, 17, 19, 0),
+    gsSP2Triangles(16, 20, 21, 0, 16, 21, 17, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(23, 18, 19, 0, 23, 19, 24, 0),
+    gsSP2Triangles(24, 26, 27, 0, 24, 27, 25, 0),
+    gsSP2Triangles(19, 28, 26, 0, 19, 26, 24, 0),
+    gsSP2Triangles(17, 21, 28, 0, 17, 28, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -996,31 +996,31 @@ Gfx d_course_kalimari_desert_packed_dl_1898[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04003460, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 6, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(14, 16, 17, 15, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(20, 22, 23, 21, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(26, 28, 29, 27, 0),
-    gsSP1Quadrangle(30, 31, 28, 26, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 6, 0, 10, 6, 9, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(14, 16, 17, 0, 14, 17, 15, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(26, 28, 29, 0, 26, 29, 27, 0),
+    gsSP2Triangles(30, 31, 28, 0, 30, 28, 26, 0),
     gsSPVertex(0x04003660, 29, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 0, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 6, 9, 11, 0),
-    gsSP1Quadrangle(8, 12, 13, 9, 0),
-    gsSP1Quadrangle(9, 13, 14, 11, 0),
-    gsSP1Quadrangle(15, 16, 17, 18, 0),
-    gsSP1Quadrangle(16, 10, 11, 17, 0),
-    gsSP1Quadrangle(11, 14, 19, 17, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(17, 19, 24, 18, 0),
-    gsSP1Quadrangle(25, 26, 27, 22, 0),
-    gsSP1Quadrangle(21, 28, 25, 22, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 0, 0, 4, 0, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 6, 9, 0, 10, 9, 11, 0),
+    gsSP2Triangles(8, 12, 13, 0, 8, 13, 9, 0),
+    gsSP2Triangles(9, 13, 14, 0, 9, 14, 11, 0),
+    gsSP2Triangles(15, 16, 17, 0, 15, 17, 18, 0),
+    gsSP2Triangles(16, 10, 11, 0, 16, 11, 17, 0),
+    gsSP2Triangles(11, 14, 19, 0, 11, 19, 17, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(17, 19, 24, 0, 17, 24, 18, 0),
+    gsSP2Triangles(25, 26, 27, 0, 25, 27, 22, 0),
+    gsSP2Triangles(21, 28, 25, 0, 21, 25, 22, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1036,19 +1036,19 @@ Gfx d_course_kalimari_desert_packed_dl_19B8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04003830, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(17, 20, 21, 18, 0),
-    gsSP1Quadrangle(20, 22, 23, 21, 0),
-    gsSP1Quadrangle(22, 24, 25, 23, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
-    gsSP1Quadrangle(30, 26, 29, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(17, 20, 21, 0, 17, 21, 18, 0),
+    gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0),
+    gsSP2Triangles(22, 24, 25, 0, 22, 25, 23, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
+    gsSP2Triangles(30, 26, 29, 0, 30, 29, 31, 0),
     gsSPVertex(0x04003A30, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1064,15 +1064,15 @@ Gfx d_course_kalimari_desert_packed_dl_1A78[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04003AB0, 28, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(10, 9, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 14, 13, 0),
-    gsSP1Quadrangle(16, 20, 21, 17, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 19, 18, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(10, 9, 16, 0, 10, 16, 17, 0),
+    gsSP2Triangles(18, 19, 14, 0, 18, 14, 13, 0),
+    gsSP2Triangles(16, 20, 21, 0, 16, 21, 17, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 19, 0, 26, 19, 18, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1098,14 +1098,14 @@ Gfx d_course_kalimari_desert_packed_dl_1B48[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04003C70, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05013000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04003CB0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1121,14 +1121,14 @@ Gfx d_course_kalimari_desert_packed_dl_1BE0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04003CF0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05015000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04003D30, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1144,14 +1144,14 @@ Gfx d_course_kalimari_desert_packed_dl_1C78[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04003D70, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05005800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04003DB0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1167,14 +1167,14 @@ Gfx d_course_kalimari_desert_packed_dl_1D10[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04003DF0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05008000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04003E30, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1190,14 +1190,14 @@ Gfx d_course_kalimari_desert_packed_dl_1DA8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04003E70, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05001800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04003EB0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1213,14 +1213,14 @@ Gfx d_course_kalimari_desert_packed_dl_1E40[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04003EF0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05003800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04003F30, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1247,8 +1247,8 @@ Gfx d_course_kalimari_desert_packed_dl_1F10[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04003F70, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1264,12 +1264,12 @@ Gfx d_course_kalimari_desert_packed_dl_1F78[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04003FF0, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1285,8 +1285,8 @@ Gfx d_course_kalimari_desert_packed_dl_2000[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04004170, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1319,7 +1319,7 @@ Gfx d_course_kalimari_desert_packed_dl_20D0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04004270, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1335,8 +1335,8 @@ Gfx d_course_kalimari_desert_packed_dl_2130[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040042B0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1352,7 +1352,7 @@ Gfx d_course_kalimari_desert_packed_dl_2198[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04004330, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1368,8 +1368,8 @@ Gfx d_course_kalimari_desert_packed_dl_21F8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04004370, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1385,7 +1385,7 @@ Gfx d_course_kalimari_desert_packed_dl_2260[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040043F0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 4, 7, 5, 0),
     gsSP2Triangles(8, 9, 10, 0, 8, 11, 9, 0),
     gsSPEndDisplayList(),
@@ -1403,8 +1403,8 @@ Gfx d_course_kalimari_desert_packed_dl_22D0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040044B0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1420,12 +1420,12 @@ Gfx d_course_kalimari_desert_packed_dl_2338[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04004530, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1441,8 +1441,8 @@ Gfx d_course_kalimari_desert_packed_dl_23C0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040046B0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 8, 11, 9, 0),
     gsSPEndDisplayList(),
 };
@@ -1459,11 +1459,11 @@ Gfx d_course_kalimari_desert_packed_dl_2430[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04004770, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1479,10 +1479,10 @@ Gfx d_course_kalimari_desert_packed_dl_24B0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040048B0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1498,8 +1498,8 @@ Gfx d_course_kalimari_desert_packed_dl_2528[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040049B0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 8, 11, 9, 0),
     gsSPEndDisplayList(),
 };
@@ -1516,11 +1516,11 @@ Gfx d_course_kalimari_desert_packed_dl_2598[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04004A70, 23, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSP1Triangle(20, 21, 22, 0),
     gsSPEndDisplayList(),
 };
@@ -1537,10 +1537,10 @@ Gfx d_course_kalimari_desert_packed_dl_2620[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04004BE0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1556,8 +1556,8 @@ Gfx d_course_kalimari_desert_packed_dl_2698[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04004CE0, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 11, 12, 13, 0),
     gsSP2Triangles(14, 15, 16, 0, 17, 18, 19, 0),
     gsSPEndDisplayList(),
@@ -1575,8 +1575,8 @@ Gfx d_course_kalimari_desert_packed_dl_2710[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04004E20, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1593,12 +1593,12 @@ Gfx d_course_kalimari_desert_packed_dl_2778[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04004EA0, 28, 0),
     gsSP2Triangles(0, 1, 2, 0, 2, 3, 0, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1614,9 +1614,9 @@ Gfx d_course_kalimari_desert_packed_dl_2808[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04005060, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1632,9 +1632,9 @@ Gfx d_course_kalimari_desert_packed_dl_2878[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04005120, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1669,13 +1669,13 @@ Gfx d_course_kalimari_desert_packed_dl_2960[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040052D0, 28, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2611,7 +2611,7 @@ Gfx d_course_kalimari_desert_packed_dl_4018[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04007680, 8, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2627,7 +2627,7 @@ Gfx d_course_kalimari_desert_packed_dl_40D0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04007700, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2643,7 +2643,7 @@ Gfx d_course_kalimari_desert_packed_dl_4130[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04007740, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -2653,8 +2653,8 @@ Gfx d_course_kalimari_desert_packed_dl_4130[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04007780, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2670,10 +2670,10 @@ Gfx d_course_kalimari_desert_packed_dl_41E8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04007800, 10, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
-    gsSP1Quadrangle(6, 0, 3, 7, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
+    gsSP2Triangles(6, 0, 3, 0, 6, 3, 7, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2690,9 +2690,9 @@ Gfx d_course_kalimari_desert_packed_dl_4260[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040078A0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -2702,12 +2702,12 @@ Gfx d_course_kalimari_desert_packed_dl_4260[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04007960, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 5, 4, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(13, 12, 2, 1, 0),
-    gsSP1Quadrangle(9, 8, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 5, 0, 8, 5, 4, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(13, 12, 2, 0, 13, 2, 1, 0),
+    gsSP2Triangles(9, 8, 14, 0, 9, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2723,11 +2723,11 @@ Gfx d_course_kalimari_desert_packed_dl_4350[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04007A60, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(4, 7, 8, 9, 0),
-    gsSP1Quadrangle(5, 10, 11, 6, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(4, 7, 8, 0, 4, 8, 9, 0),
+    gsSP2Triangles(5, 10, 11, 0, 5, 11, 6, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -2739,8 +2739,8 @@ Gfx d_course_kalimari_desert_packed_dl_4350[] =
     gsSPVertex(0x04007B60, 16, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(6, 7, 8, 0, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 1, 0, 13, 0),
-    gsSP1Quadrangle(5, 14, 15, 3, 0),
+    gsSP2Triangles(12, 1, 0, 0, 12, 0, 13, 0),
+    gsSP2Triangles(5, 14, 15, 0, 5, 15, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2756,7 +2756,7 @@ Gfx d_course_kalimari_desert_packed_dl_4438[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04007C60, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -2766,8 +2766,8 @@ Gfx d_course_kalimari_desert_packed_dl_4438[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04007CA0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2783,9 +2783,9 @@ Gfx d_course_kalimari_desert_packed_dl_44F0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04007D20, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -2796,11 +2796,11 @@ Gfx d_course_kalimari_desert_packed_dl_44F0[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04007DE0, 16, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(6, 5, 10, 9, 0),
-    gsSP1Quadrangle(13, 3, 0, 14, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(6, 5, 10, 0, 6, 10, 9, 0),
+    gsSP2Triangles(13, 3, 0, 0, 13, 0, 14, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2816,9 +2816,9 @@ Gfx d_course_kalimari_desert_packed_dl_45D8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04007EE0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -2828,12 +2828,12 @@ Gfx d_course_kalimari_desert_packed_dl_45D8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04007FA0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 5, 4, 9, 0),
-    gsSP1Quadrangle(9, 10, 11, 8, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(0, 12, 15, 1, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 5, 4, 0, 8, 4, 9, 0),
+    gsSP2Triangles(9, 10, 11, 0, 9, 11, 8, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(0, 12, 15, 0, 0, 15, 1, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2849,9 +2849,9 @@ Gfx d_course_kalimari_desert_packed_dl_46C0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040080A0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -2863,10 +2863,10 @@ Gfx d_course_kalimari_desert_packed_dl_46C0[] =
     gsSPVertex(0x04008160, 17, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 1, 0),
     gsSP2Triangles(5, 6, 7, 0, 6, 8, 7, 0),
-    gsSP1Quadrangle(9, 10, 11, 12, 0),
-    gsSP1Quadrangle(10, 6, 5, 11, 0),
-    gsSP1Quadrangle(13, 0, 2, 14, 0),
-    gsSP1Quadrangle(15, 13, 14, 16, 0),
+    gsSP2Triangles(9, 10, 11, 0, 9, 11, 12, 0),
+    gsSP2Triangles(10, 6, 5, 0, 10, 5, 11, 0),
+    gsSP2Triangles(13, 0, 2, 0, 13, 2, 14, 0),
+    gsSP2Triangles(15, 13, 14, 0, 15, 14, 16, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2882,8 +2882,8 @@ Gfx d_course_kalimari_desert_packed_dl_47A8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04008270, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -2893,10 +2893,10 @@ Gfx d_course_kalimari_desert_packed_dl_47A8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040082F0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 2, 1, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(7, 10, 11, 8, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 2, 1, 0, 4, 1, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(7, 10, 11, 0, 7, 11, 8, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2913,8 +2913,8 @@ Gfx d_course_kalimari_desert_packed_dl_4878[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040083B0, 12, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 0, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -2925,8 +2925,8 @@ Gfx d_course_kalimari_desert_packed_dl_4878[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04008470, 10, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(1, 6, 7, 2, 0),
-    gsSP1Quadrangle(8, 4, 3, 9, 0),
+    gsSP2Triangles(1, 6, 7, 0, 1, 7, 2, 0),
+    gsSP2Triangles(8, 4, 3, 0, 8, 3, 9, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2959,7 +2959,7 @@ Gfx d_course_kalimari_desert_packed_dl_49B0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04008510, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3014,9 +3014,9 @@ Gfx d_course_kalimari_desert_packed_dl_4B08[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04008630, 14, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3032,7 +3032,7 @@ Gfx d_course_kalimari_desert_packed_dl_4B78[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04008710, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3048,7 +3048,7 @@ Gfx d_course_kalimari_desert_packed_dl_4BD8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04008750, 10, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
     gsSPEndDisplayList(),
 };
@@ -3101,7 +3101,7 @@ Gfx d_course_kalimari_desert_packed_dl_4D20[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040089E0, 13, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
     gsSP1Triangle(10, 11, 12, 0),
     gsSPEndDisplayList(),
@@ -3170,9 +3170,9 @@ Gfx d_course_kalimari_desert_packed_dl_4EC8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04008C80, 18, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 15, 16, 17, 0),
     gsSPEndDisplayList(),
 };
@@ -3189,7 +3189,7 @@ Gfx d_course_kalimari_desert_packed_dl_4F40[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04008DA0, 13, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
     gsSP1Triangle(10, 11, 12, 0),
     gsSPEndDisplayList(),
@@ -3208,8 +3208,8 @@ Gfx d_course_kalimari_desert_packed_dl_4FB0[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04008E70, 14, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3225,9 +3225,9 @@ Gfx d_course_kalimari_desert_packed_dl_5020[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04008F50, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3261,9 +3261,9 @@ Gfx d_course_kalimari_desert_packed_dl_5100[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04009100, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3279,7 +3279,7 @@ Gfx d_course_kalimari_desert_packed_dl_5170[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040091C0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3295,7 +3295,7 @@ Gfx d_course_kalimari_desert_packed_dl_51D0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04009200, 10, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
     gsSPEndDisplayList(),
 };
@@ -3533,13 +3533,13 @@ Gfx d_course_kalimari_desert_packed_dl_57D0[] =
     gsSPVertex(0x0400A450, 31, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(3, 6, 4, 0, 3, 7, 8, 0),
-    gsSP1Quadrangle(9, 10, 11, 12, 0),
+    gsSP2Triangles(9, 10, 11, 0, 9, 11, 12, 0),
     gsSP2Triangles(9, 13, 14, 0, 15, 16, 17, 0),
     gsSP2Triangles(15, 18, 16, 0, 19, 20, 21, 0),
     gsSP2Triangles(22, 23, 24, 0, 25, 26, 27, 0),
     gsSP1Triangle(28, 29, 30, 0),
     gsSPVertex(0x0400A640, 7, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP1Triangle(4, 5, 6, 0),
     gsSPEndDisplayList(),
 };
@@ -3591,7 +3591,7 @@ Gfx d_course_kalimari_desert_packed_dl_5948[] =
     gsSP2Triangles(12, 13, 14, 0, 3, 15, 16, 0),
     gsSP2Triangles(17, 18, 19, 0, 20, 21, 22, 0),
     gsSP2Triangles(23, 24, 25, 0, 17, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0400ACF0, 15, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(6, 7, 8, 0, 9, 10, 11, 0),
@@ -4210,7 +4210,7 @@ Gfx d_course_kalimari_desert_packed_dl_6958[] =
     gsSPVertex(0x0400EBE0, 31, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 4, 0),
     gsSP2Triangles(5, 6, 7, 0, 8, 9, 10, 0),
-    gsSP1Quadrangle(11, 12, 13, 14, 0),
+    gsSP2Triangles(11, 12, 13, 0, 11, 13, 14, 0),
     gsSP2Triangles(15, 16, 17, 0, 18, 19, 20, 0),
     gsSP2Triangles(18, 20, 21, 0, 22, 23, 24, 0),
     gsSP2Triangles(25, 26, 27, 0, 28, 29, 30, 0),
@@ -4488,29 +4488,29 @@ Gfx d_course_kalimari_desert_packed_dl_70F8[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x04010500, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 1, 0, 0),
-    gsSP1Quadrangle(6, 7, 4, 0, 0),
-    gsSP1Quadrangle(6, 0, 3, 8, 0),
-    gsSP1Quadrangle(3, 2, 9, 10, 0),
-    gsSP1Quadrangle(11, 12, 13, 8, 0),
-    gsSP1Quadrangle(8, 13, 14, 6, 0),
-    gsSP1Quadrangle(6, 14, 15, 7, 0),
-    gsSP1Quadrangle(7, 15, 16, 17, 0),
-    gsSP1Quadrangle(7, 17, 18, 4, 0),
-    gsSP1Quadrangle(19, 20, 21, 22, 0),
-    gsSP1Quadrangle(23, 24, 19, 22, 0),
-    gsSP1Quadrangle(25, 26, 20, 19, 0),
-    gsSP1Quadrangle(22, 21, 27, 28, 0),
-    gsSP1Quadrangle(29, 23, 22, 28, 0),
-    gsSP1Quadrangle(17, 29, 28, 18, 0),
-    gsSP1Quadrangle(28, 27, 30, 18, 0),
-    gsSP1Quadrangle(18, 30, 5, 4, 0),
-    gsSP1Quadrangle(17, 16, 31, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0),
+    gsSP2Triangles(6, 7, 4, 0, 6, 4, 0, 0),
+    gsSP2Triangles(6, 0, 3, 0, 6, 3, 8, 0),
+    gsSP2Triangles(3, 2, 9, 0, 3, 9, 10, 0),
+    gsSP2Triangles(11, 12, 13, 0, 11, 13, 8, 0),
+    gsSP2Triangles(8, 13, 14, 0, 8, 14, 6, 0),
+    gsSP2Triangles(6, 14, 15, 0, 6, 15, 7, 0),
+    gsSP2Triangles(7, 15, 16, 0, 7, 16, 17, 0),
+    gsSP2Triangles(7, 17, 18, 0, 7, 18, 4, 0),
+    gsSP2Triangles(19, 20, 21, 0, 19, 21, 22, 0),
+    gsSP2Triangles(23, 24, 19, 0, 23, 19, 22, 0),
+    gsSP2Triangles(25, 26, 20, 0, 25, 20, 19, 0),
+    gsSP2Triangles(22, 21, 27, 0, 22, 27, 28, 0),
+    gsSP2Triangles(29, 23, 22, 0, 29, 22, 28, 0),
+    gsSP2Triangles(17, 29, 28, 0, 17, 28, 18, 0),
+    gsSP2Triangles(28, 27, 30, 0, 28, 30, 18, 0),
+    gsSP2Triangles(18, 30, 5, 0, 18, 5, 4, 0),
+    gsSP2Triangles(17, 16, 31, 0, 17, 31, 29, 0),
     gsSPVertex(0x04010700, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
-    gsSP1Quadrangle(5, 4, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
+    gsSP2Triangles(5, 4, 6, 0, 5, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4545,10 +4545,10 @@ Gfx d_course_kalimari_desert_packed_dl_71D8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040108E0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4564,11 +4564,11 @@ Gfx d_course_kalimari_desert_packed_dl_72B8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040109E0, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 6, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x007C),
@@ -4578,11 +4578,11 @@ Gfx d_course_kalimari_desert_packed_dl_72B8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04010B20, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4598,12 +4598,12 @@ Gfx d_course_kalimari_desert_packed_dl_73A8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04010C60, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 6, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x007C),
@@ -4613,12 +4613,12 @@ Gfx d_course_kalimari_desert_packed_dl_73A8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04010DE0, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4634,11 +4634,11 @@ Gfx d_course_kalimari_desert_packed_dl_74A8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04010F60, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 6, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x007C),
@@ -4648,11 +4648,11 @@ Gfx d_course_kalimari_desert_packed_dl_74A8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040110A0, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4677,10 +4677,10 @@ Gfx d_course_kalimari_desert_packed_dl_75C0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040111E0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -4690,14 +4690,14 @@ Gfx d_course_kalimari_desert_packed_dl_75C0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040112E0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4713,8 +4713,8 @@ Gfx d_course_kalimari_desert_packed_dl_76C0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040114E0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4730,8 +4730,8 @@ Gfx d_course_kalimari_desert_packed_dl_7728[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04011560, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -4741,10 +4741,10 @@ Gfx d_course_kalimari_desert_packed_dl_7728[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040115E0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4760,14 +4760,14 @@ Gfx d_course_kalimari_desert_packed_dl_77F8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040116E0, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 0, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 6, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(14, 16, 17, 15, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(20, 22, 23, 21, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 0, 0, 4, 0, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 6, 0, 10, 6, 9, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(14, 16, 17, 0, 14, 17, 15, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4783,14 +4783,14 @@ Gfx d_course_kalimari_desert_packed_dl_7890[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04011860, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(2, 16, 17, 3, 0),
-    gsSP1Quadrangle(6, 18, 19, 7, 0),
-    gsSP1Quadrangle(10, 20, 21, 11, 0),
-    gsSP1Quadrangle(14, 22, 23, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(2, 16, 17, 0, 2, 17, 3, 0),
+    gsSP2Triangles(6, 18, 19, 0, 6, 19, 7, 0),
+    gsSP2Triangles(10, 20, 21, 0, 10, 21, 11, 0),
+    gsSP2Triangles(14, 22, 23, 0, 14, 23, 15, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -4800,23 +4800,23 @@ Gfx d_course_kalimari_desert_packed_dl_7890[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040119E0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04011BE0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4832,16 +4832,16 @@ Gfx d_course_kalimari_desert_packed_dl_79F8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04011DE0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(2, 16, 17, 3, 0),
-    gsSP1Quadrangle(6, 18, 19, 7, 0),
-    gsSP1Quadrangle(10, 20, 21, 11, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
-    gsSP1Quadrangle(30, 31, 26, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(2, 16, 17, 0, 2, 17, 3, 0),
+    gsSP2Triangles(6, 18, 19, 0, 6, 19, 7, 0),
+    gsSP2Triangles(10, 20, 21, 0, 10, 21, 11, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
+    gsSP2Triangles(30, 31, 26, 0, 30, 26, 29, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -4851,23 +4851,23 @@ Gfx d_course_kalimari_desert_packed_dl_79F8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04011FE0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x040121E0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 6, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x007C),
@@ -4877,8 +4877,8 @@ Gfx d_course_kalimari_desert_packed_dl_79F8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040123E0, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4894,10 +4894,10 @@ Gfx d_course_kalimari_desert_packed_dl_7BC8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04012440, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -4907,14 +4907,14 @@ Gfx d_course_kalimari_desert_packed_dl_7BC8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04012540, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4930,13 +4930,13 @@ Gfx d_course_kalimari_desert_packed_dl_7CC8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04012740, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 0, 3, 0),
-    gsSP1Quadrangle(10, 11, 4, 7, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 0, 0, 8, 0, 3, 0),
+    gsSP2Triangles(10, 11, 4, 0, 10, 4, 7, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -4946,21 +4946,21 @@ Gfx d_course_kalimari_desert_packed_dl_7CC8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040128C0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 0, 3, 0),
-    gsSP1Quadrangle(26, 27, 4, 7, 0),
-    gsSP1Quadrangle(28, 29, 8, 11, 0),
-    gsSP1Quadrangle(30, 31, 12, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 0, 0, 24, 0, 3, 0),
+    gsSP2Triangles(26, 27, 4, 0, 26, 4, 7, 0),
+    gsSP2Triangles(28, 29, 8, 0, 28, 8, 11, 0),
+    gsSP2Triangles(30, 31, 12, 0, 30, 12, 15, 0),
     gsSPVertex(0x04012AC0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(8, 10, 11, 9, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4976,14 +4976,14 @@ Gfx d_course_kalimari_desert_packed_dl_7E18[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04012B80, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 0, 3, 0),
-    gsSP1Quadrangle(18, 19, 4, 7, 0),
-    gsSP1Quadrangle(20, 21, 8, 11, 0),
-    gsSP1Quadrangle(22, 23, 12, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 0, 0, 16, 0, 3, 0),
+    gsSP2Triangles(18, 19, 4, 0, 18, 4, 7, 0),
+    gsSP2Triangles(20, 21, 8, 0, 20, 8, 11, 0),
+    gsSP2Triangles(22, 23, 12, 0, 22, 12, 15, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -4993,23 +4993,23 @@ Gfx d_course_kalimari_desert_packed_dl_7E18[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04012D00, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04012F00, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5025,12 +5025,12 @@ Gfx d_course_kalimari_desert_packed_dl_7F80[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04013100, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -5040,19 +5040,19 @@ Gfx d_course_kalimari_desert_packed_dl_7F80[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04013280, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(14, 16, 17, 15, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(20, 22, 23, 21, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(14, 16, 17, 0, 14, 17, 15, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04013480, 10, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(6, 8, 9, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(6, 8, 9, 0, 6, 9, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5068,9 +5068,9 @@ Gfx d_course_kalimari_desert_packed_dl_80B8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04013520, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -5080,12 +5080,12 @@ Gfx d_course_kalimari_desert_packed_dl_80B8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040135E0, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5101,12 +5101,12 @@ Gfx d_course_kalimari_desert_packed_dl_81A0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04013760, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(8, 10, 11, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -5116,19 +5116,19 @@ Gfx d_course_kalimari_desert_packed_dl_81A0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040138A0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(8, 10, 11, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(14, 16, 17, 15, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(20, 22, 23, 21, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(14, 16, 17, 0, 14, 17, 15, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04013AA0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 6, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x007C),
@@ -5138,8 +5138,8 @@ Gfx d_course_kalimari_desert_packed_dl_81A0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04013B20, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 0, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 0, 0, 4, 0, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5172,11 +5172,11 @@ Gfx d_course_kalimari_desert_packed_dl_8398[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04013B80, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5192,10 +5192,10 @@ Gfx d_course_kalimari_desert_packed_dl_8418[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04013CC0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5211,10 +5211,10 @@ Gfx d_course_kalimari_desert_packed_dl_8490[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04013DC0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5230,14 +5230,14 @@ Gfx d_course_kalimari_desert_packed_dl_8508[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04013EC0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5253,9 +5253,9 @@ Gfx d_course_kalimari_desert_packed_dl_85A0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040140C0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5271,11 +5271,11 @@ Gfx d_course_kalimari_desert_packed_dl_8610[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04014180, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5291,14 +5291,14 @@ Gfx d_course_kalimari_desert_packed_dl_8690[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040142C0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500B000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04014300, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5314,9 +5314,9 @@ Gfx d_course_kalimari_desert_packed_dl_8728[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04014340, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5332,9 +5332,9 @@ Gfx d_course_kalimari_desert_packed_dl_8798[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04014400, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5350,11 +5350,11 @@ Gfx d_course_kalimari_desert_packed_dl_8808[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040144C0, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5370,14 +5370,14 @@ Gfx d_course_kalimari_desert_packed_dl_8888[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04014600, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5393,9 +5393,9 @@ Gfx d_course_kalimari_desert_packed_dl_8920[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04014800, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5411,17 +5411,17 @@ Gfx d_course_kalimari_desert_packed_dl_8990[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040148C0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04014AC0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5437,12 +5437,12 @@ Gfx d_course_kalimari_desert_packed_dl_8A40[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04014B40, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5458,14 +5458,14 @@ Gfx d_course_kalimari_desert_packed_dl_8AC8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04014CC0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5481,16 +5481,16 @@ Gfx d_course_kalimari_desert_packed_dl_8B60[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04014EC0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x040150C0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5506,13 +5506,13 @@ Gfx d_course_kalimari_desert_packed_dl_8C08[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04015100, 28, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5528,12 +5528,12 @@ Gfx d_course_kalimari_desert_packed_dl_8C98[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040152C0, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5549,10 +5549,10 @@ Gfx d_course_kalimari_desert_packed_dl_8D20[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04015440, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5568,12 +5568,12 @@ Gfx d_course_kalimari_desert_packed_dl_8D98[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04015540, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5614,12 +5614,12 @@ Gfx d_course_kalimari_desert_packed_dl_8EC8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040156C0, 22, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(2, 8, 3, 0, 8, 9, 3, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5635,16 +5635,16 @@ Gfx d_course_kalimari_desert_packed_dl_8F50[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04015820, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04015A20, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5660,9 +5660,9 @@ Gfx d_course_kalimari_desert_packed_dl_8FF8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04015A60, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5678,9 +5678,9 @@ Gfx d_course_kalimari_desert_packed_dl_9068[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04015B20, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5696,7 +5696,7 @@ Gfx d_course_kalimari_desert_packed_dl_90D8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04015BE0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5712,9 +5712,9 @@ Gfx d_course_kalimari_desert_packed_dl_9138[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04015C20, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5730,8 +5730,8 @@ Gfx d_course_kalimari_desert_packed_dl_91A8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04015CE0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5747,9 +5747,9 @@ Gfx d_course_kalimari_desert_packed_dl_9210[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04015D60, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5765,10 +5765,10 @@ Gfx d_course_kalimari_desert_packed_dl_9280[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04015E20, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5784,9 +5784,9 @@ Gfx d_course_kalimari_desert_packed_dl_92F8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04015F20, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5802,12 +5802,12 @@ Gfx d_course_kalimari_desert_packed_dl_9368[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04015FE0, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5823,12 +5823,12 @@ Gfx d_course_kalimari_desert_packed_dl_93F0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04016160, 23, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(3, 8, 0, 0, 3, 9, 8, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
     gsSP1Triangle(19, 22, 20, 0),
     gsSPEndDisplayList(),
 };
@@ -5845,13 +5845,13 @@ Gfx d_course_kalimari_desert_packed_dl_9480[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040162D0, 28, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5867,12 +5867,12 @@ Gfx d_course_kalimari_desert_packed_dl_9510[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04016490, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5888,14 +5888,14 @@ Gfx d_course_kalimari_desert_packed_dl_9598[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04016610, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5911,10 +5911,10 @@ Gfx d_course_kalimari_desert_packed_dl_9630[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04016810, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5930,14 +5930,14 @@ Gfx d_course_kalimari_desert_packed_dl_96A8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04016910, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5953,10 +5953,10 @@ Gfx d_course_kalimari_desert_packed_dl_9740[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04016B10, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5972,8 +5972,8 @@ Gfx d_course_kalimari_desert_packed_dl_97B8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04016C10, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5989,19 +5989,19 @@ Gfx d_course_kalimari_desert_packed_dl_9820[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04016C90, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSP2Triangles(28, 29, 30, 0, 29, 31, 30, 0),
     gsSPVertex(0x04016E90, 16, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(3, 5, 6, 0, 4, 7, 5, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6017,10 +6017,10 @@ Gfx d_course_kalimari_desert_packed_dl_98E0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04016F90, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6036,11 +6036,11 @@ Gfx d_course_kalimari_desert_packed_dl_9958[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04017090, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6056,12 +6056,12 @@ Gfx d_course_kalimari_desert_packed_dl_99D8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040171D0, 25, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSP1Triangle(21, 24, 22, 0),
     gsSPEndDisplayList(),
 };
@@ -6078,16 +6078,16 @@ Gfx d_course_kalimari_desert_packed_dl_9A68[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04017360, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04017560, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6352,7 +6352,7 @@ Gfx d_course_kalimari_desert_packed_dl_A138[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04018280, 9, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 0, 7, 8, 0),
     gsSPEndDisplayList(),
 };
diff --git a/courses/mushroom_cup/koopa_troopa_beach/course_data.inc.c b/courses/mushroom_cup/koopa_troopa_beach/course_data.inc.c
index 2e50bb4fb..7849b5b6b 100644
--- a/courses/mushroom_cup/koopa_troopa_beach/course_data.inc.c
+++ b/courses/mushroom_cup/koopa_troopa_beach/course_data.inc.c
@@ -8474,7 +8474,7 @@ Gfx d_course_koopa_troopa_beach_dl_16630[] =
     gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2),
     gsDPLoadTextureBlock(d_course_koopa_troopa_beach_bird_wing, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 5, 5, G_TX_NOLOD, G_TX_NOLOD),
     gsSPVertex(d_course_koopa_troopa_beach_bird_model, 3, 0),
-    gsSP1Quadrangle(0, 1, 2, 1, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 1, 0),
     gsSPEndDisplayList(),
 };
 
@@ -8494,7 +8494,7 @@ Gfx d_course_koopa_troopa_beach_dl_16850[] =
 {
     gsSPVertex(d_course_koopa_troopa_beach_bird_wing_model, 8, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -8514,7 +8514,7 @@ Gfx d_course_koopa_troopa_beach_dl_168F0[] =
 {
     gsSPVertex(d_course_koopa_troopa_beach_bird_wing_2_model, 8, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -8534,7 +8534,7 @@ Gfx d_course_koopa_troopa_beach_dl_16990[] =
 {
     gsSPVertex(d_course_koopa_troopa_beach_bird_wing_3_model, 8, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
diff --git a/courses/mushroom_cup/koopa_troopa_beach/packed.inc.c b/courses/mushroom_cup/koopa_troopa_beach/packed.inc.c
index 05308a7d9..1a0421346 100644
--- a/courses/mushroom_cup/koopa_troopa_beach/packed.inc.c
+++ b/courses/mushroom_cup/koopa_troopa_beach/packed.inc.c
@@ -17,7 +17,7 @@ Gfx d_course_koopa_troopa_beach_packed_dl_0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000000, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 6, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x007C),
@@ -27,7 +27,7 @@ Gfx d_course_koopa_troopa_beach_packed_dl_0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04000040, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -43,7 +43,7 @@ Gfx d_course_koopa_troopa_beach_packed_dl_B0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000080, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 6, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x007C),
@@ -53,7 +53,7 @@ Gfx d_course_koopa_troopa_beach_packed_dl_B0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040000C0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -69,7 +69,7 @@ Gfx d_course_koopa_troopa_beach_packed_dl_160[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000100, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 6, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x007C),
@@ -79,7 +79,7 @@ Gfx d_course_koopa_troopa_beach_packed_dl_160[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04000140, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -95,7 +95,7 @@ Gfx d_course_koopa_troopa_beach_packed_dl_210[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000180, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 6, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x007C),
@@ -105,7 +105,7 @@ Gfx d_course_koopa_troopa_beach_packed_dl_210[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040001C0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -131,9 +131,9 @@ Gfx d_course_koopa_troopa_beach_packed_dl_2E8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000200, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -176,7 +176,7 @@ Gfx d_course_koopa_troopa_beach_packed_dl_390[] =
     gsSP2Triangles(23, 24, 25, 0, 26, 27, 28, 0),
     gsSP1Triangle(29, 30, 31, 0),
     gsSPVertex(0x040004C0, 21, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(10, 11, 12, 0, 13, 14, 15, 0),
     gsSP2Triangles(16, 13, 17, 0, 18, 19, 20, 0),
@@ -202,11 +202,11 @@ Gfx d_course_koopa_troopa_beach_packed_dl_440[] =
     gsSP2Triangles(22, 23, 24, 0, 25, 26, 27, 0),
     gsSP1Triangle(28, 29, 30, 0),
     gsSPVertex(0x04000800, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSP2Triangles(20, 21, 22, 0, 23, 24, 25, 0),
     gsSP2Triangles(26, 27, 28, 0, 29, 30, 31, 0),
     gsSPVertex(0x04000A00, 6, 0),
@@ -235,17 +235,17 @@ Gfx d_course_koopa_troopa_beach_packed_dl_518[] =
     gsSPVertex(0x04000C50, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(6, 7, 8, 0, 7, 9, 10, 0),
-    gsSP1Quadrangle(11, 12, 13, 14, 0),
-    gsSP1Quadrangle(15, 16, 17, 18, 0),
+    gsSP2Triangles(11, 12, 13, 0, 11, 13, 14, 0),
+    gsSP2Triangles(15, 16, 17, 0, 15, 17, 18, 0),
     gsSP2Triangles(19, 20, 21, 0, 22, 23, 24, 0),
-    gsSP1Quadrangle(25, 26, 27, 28, 0),
+    gsSP2Triangles(25, 26, 27, 0, 25, 27, 28, 0),
     gsSP1Triangle(29, 30, 31, 0),
     gsSPVertex(0x04000E50, 26, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(3, 5, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(10, 11, 12, 0, 13, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
     gsSPEndDisplayList(),
 };
 
@@ -266,12 +266,12 @@ Gfx d_course_koopa_troopa_beach_packed_dl_610[] =
     gsSP2Triangles(12, 13, 14, 0, 15, 16, 17, 0),
     gsSP2Triangles(18, 15, 19, 0, 20, 21, 22, 0),
     gsSP2Triangles(23, 24, 22, 0, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x040011F0, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 19, 20, 21, 0),
     gsSP2Triangles(22, 23, 24, 0, 25, 26, 27, 0),
     gsSP1Triangle(28, 29, 30, 0),
@@ -322,7 +322,7 @@ Gfx d_course_koopa_troopa_beach_packed_dl_778[] =
     gsSP2Triangles(22, 24, 25, 0, 26, 27, 28, 0),
     gsSP1Triangle(26, 28, 29, 0),
     gsSPVertex(0x04001890, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(10, 11, 12, 0, 13, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 19, 20, 21, 0),
@@ -355,8 +355,8 @@ Gfx d_course_koopa_troopa_beach_packed_dl_858[] =
     gsSPVertex(0x04001CF0, 30, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 4, 0),
     gsSP2Triangles(5, 6, 7, 0, 8, 9, 5, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
     gsSP2Triangles(18, 19, 20, 0, 21, 22, 23, 0),
     gsSP2Triangles(24, 25, 26, 0, 27, 28, 29, 0),
     gsSPVertex(0x04001ED0, 3, 0),
@@ -384,7 +384,7 @@ Gfx d_course_koopa_troopa_beach_packed_dl_928[] =
     gsSP2Triangles(24, 26, 27, 0, 28, 29, 30, 0),
     gsSP1Triangle(28, 30, 31, 0),
     gsSPVertex(0x04002100, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(10, 11, 12, 0, 13, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 19, 20, 21, 0),
@@ -418,12 +418,12 @@ Gfx d_course_koopa_troopa_beach_packed_dl_A00[] =
     gsSP2Triangles(3, 5, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(7, 9, 10, 0, 11, 12, 13, 0),
     gsSP2Triangles(11, 13, 14, 0, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
     gsSP2Triangles(26, 27, 28, 0, 29, 30, 31, 0),
     gsSPVertex(0x04002740, 10, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsSPEndDisplayList(),
 };
 
@@ -448,17 +448,17 @@ Gfx d_course_koopa_troopa_beach_packed_dl_AE0[] =
     gsSPVertex(0x040029E0, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(6, 7, 8, 0, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04002BE0, 26, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(3, 5, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(10, 11, 12, 0, 13, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
     gsSPEndDisplayList(),
 };
 
@@ -481,10 +481,10 @@ Gfx d_course_koopa_troopa_beach_packed_dl_BD8[] =
     gsSP2Triangles(24, 25, 26, 0, 27, 28, 29, 0),
     gsSPVertex(0x04002F60, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
     gsSP2Triangles(22, 23, 24, 0, 25, 26, 27, 0),
     gsSP2Triangles(25, 27, 28, 0, 29, 30, 31, 0),
     gsSPVertex(0x04003160, 17, 0),
@@ -511,12 +511,12 @@ Gfx d_course_koopa_troopa_beach_packed_dl_CC0[] =
     gsSP2Triangles(6, 7, 8, 0, 9, 10, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 15, 16, 17, 0),
     gsSP2Triangles(18, 19, 17, 0, 20, 21, 22, 0),
-    gsSP1Quadrangle(23, 24, 25, 26, 0),
-    gsSP1Quadrangle(27, 28, 29, 30, 0),
+    gsSP2Triangles(23, 24, 25, 0, 23, 25, 26, 0),
+    gsSP2Triangles(27, 28, 29, 0, 27, 29, 30, 0),
     gsSPVertex(0x04003460, 18, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 15, 16, 17, 0),
     gsSPEndDisplayList(),
 };
@@ -537,12 +537,12 @@ Gfx d_course_koopa_troopa_beach_packed_dl_D70[] =
     gsSP2Triangles(6, 7, 8, 0, 9, 10, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 15, 16, 17, 0),
     gsSP2Triangles(15, 17, 18, 0, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPVertex(0x04003760, 18, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 15, 16, 17, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05007000),
     gsDPTileSync(),
@@ -577,11 +577,11 @@ Gfx d_course_koopa_troopa_beach_packed_dl_E60[] =
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(3, 5, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(10, 11, 12, 0, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSP2Triangles(20, 21, 22, 0, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPVertex(0x04003CB0, 7, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP1Triangle(4, 5, 6, 0),
     gsSPEndDisplayList(),
 };
@@ -654,9 +654,9 @@ Gfx d_course_koopa_troopa_beach_packed_dl_10B0[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040044A0, 30, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
     gsSP2Triangles(18, 19, 20, 0, 21, 22, 23, 0),
     gsSP2Triangles(21, 23, 24, 0, 25, 26, 27, 0),
     gsSP1Triangle(16, 28, 29, 0),
@@ -685,11 +685,11 @@ Gfx d_course_koopa_troopa_beach_packed_dl_1190[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04004940, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -736,9 +736,9 @@ Gfx d_course_koopa_troopa_beach_packed_dl_12D0[] =
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(6, 7, 8, 0, 9, 10, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
     gsSP2Triangles(22, 23, 24, 0, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04005010, 30, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(6, 7, 8, 0, 9, 10, 11, 0),
@@ -750,7 +750,7 @@ Gfx d_course_koopa_troopa_beach_packed_dl_12D0[] =
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(3, 5, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(10, 11, 12, 0, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 15, 17, 18, 0),
+    gsSP2Triangles(16, 15, 17, 0, 16, 17, 18, 0),
     gsSP2Triangles(19, 16, 20, 0, 21, 22, 23, 0),
     gsSP2Triangles(8, 24, 25, 0, 26, 27, 23, 0),
     gsSP1Triangle(28, 29, 30, 0),
@@ -807,14 +807,14 @@ Gfx d_course_koopa_troopa_beach_packed_dl_14D0[] =
     gsSPVertex(0x040059A0, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(6, 7, 8, 0, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 19, 20, 21, 0),
     gsSP2Triangles(22, 23, 24, 0, 25, 26, 27, 0),
     gsSP2Triangles(25, 27, 28, 0, 29, 30, 24, 0),
     gsSP1Triangle(29, 24, 31, 0),
     gsSPVertex(0x04005BA0, 22, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 11, 12, 13, 0),
     gsSP2Triangles(14, 15, 12, 0, 16, 17, 18, 0),
     gsSP1Triangle(19, 20, 21, 0),
@@ -838,12 +838,12 @@ Gfx d_course_koopa_troopa_beach_packed_dl_1590[] =
     gsSP2Triangles(10, 11, 12, 0, 13, 14, 15, 0),
     gsSP2Triangles(16, 15, 17, 0, 18, 19, 20, 0),
     gsSP2Triangles(21, 22, 23, 0, 24, 25, 26, 0),
-    gsSP1Quadrangle(27, 28, 29, 30, 0),
+    gsSP2Triangles(27, 28, 29, 0, 27, 29, 30, 0),
     gsSPVertex(0x04005EF0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 18, 19, 20, 0),
     gsSP2Triangles(21, 22, 23, 0, 24, 25, 26, 0),
     gsSP2Triangles(27, 28, 29, 0, 18, 30, 31, 0),
@@ -913,15 +913,15 @@ Gfx d_course_koopa_troopa_beach_packed_dl_1778[] =
     gsSP2Triangles(23, 24, 25, 0, 26, 27, 28, 0),
     gsSP1Triangle(26, 28, 29, 0),
     gsSPVertex(0x04006670, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 19, 20, 21, 0),
     gsSP2Triangles(22, 23, 24, 0, 25, 26, 16, 0),
-    gsSP1Quadrangle(27, 28, 29, 30, 0),
+    gsSP2Triangles(27, 28, 29, 0, 27, 29, 30, 0),
     gsSPVertex(0x04006860, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -945,7 +945,7 @@ Gfx d_course_koopa_troopa_beach_packed_dl_1850[] =
     gsSP1Triangle(27, 28, 29, 0),
     gsSPVertex(0x04006A80, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsSP2Triangles(10, 11, 5, 0, 5, 12, 13, 0),
     gsSP2Triangles(14, 15, 16, 0, 17, 18, 19, 0),
     gsSP2Triangles(17, 19, 20, 0, 21, 22, 23, 0),
@@ -986,12 +986,12 @@ Gfx d_course_koopa_troopa_beach_packed_dl_1940[] =
     gsSP2Triangles(23, 25, 26, 0, 27, 28, 29, 0),
     gsSP1Triangle(27, 29, 30, 0),
     gsSPVertex(0x04007180, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 11, 12, 13, 0),
     gsSP2Triangles(14, 15, 16, 0, 17, 18, 19, 0),
     gsSP2Triangles(20, 21, 22, 0, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1023,14 +1023,14 @@ Gfx d_course_koopa_troopa_beach_packed_dl_1A40[] =
     gsSP1Triangle(27, 29, 30, 0),
     gsSPVertex(0x04007750, 31, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsSP2Triangles(10, 11, 2, 0, 12, 13, 14, 0),
     gsSP2Triangles(15, 16, 17, 0, 18, 19, 20, 0),
     gsSP2Triangles(12, 21, 22, 0, 23, 24, 20, 0),
     gsSP2Triangles(25, 26, 27, 0, 28, 29, 30, 0),
     gsSPVertex(0x04007940, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1051,11 +1051,11 @@ Gfx d_course_koopa_troopa_beach_packed_dl_1B58[] =
     gsSP2Triangles(9, 11, 12, 0, 13, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 19, 20, 21, 0),
     gsSP2Triangles(22, 23, 18, 0, 24, 25, 20, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPVertex(0x04007BA0, 28, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
     gsSP2Triangles(14, 15, 16, 0, 17, 18, 19, 0),
     gsSP2Triangles(20, 21, 22, 0, 20, 23, 24, 0),
     gsSP1Triangle(25, 26, 27, 0),
@@ -1077,7 +1077,7 @@ Gfx d_course_koopa_troopa_beach_packed_dl_1C18[] =
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 0, 0),
     gsSP2Triangles(5, 6, 7, 0, 8, 9, 10, 0),
     gsSP2Triangles(11, 12, 13, 0, 14, 15, 16, 0),
-    gsSP1Quadrangle(17, 18, 19, 20, 0),
+    gsSP2Triangles(17, 18, 19, 0, 17, 19, 20, 0),
     gsSP2Triangles(21, 22, 23, 0, 24, 25, 26, 0),
     gsSP2Triangles(27, 28, 29, 0, 30, 27, 31, 0),
     gsSPVertex(0x04007F60, 15, 0),
@@ -1107,10 +1107,10 @@ Gfx d_course_koopa_troopa_beach_packed_dl_1CC0[] =
     gsSP1Triangle(27, 28, 29, 0),
     gsSPVertex(0x04008230, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
     gsSP2Triangles(22, 23, 24, 0, 25, 26, 27, 0),
     gsSP2Triangles(25, 27, 28, 0, 29, 30, 31, 0),
     gsSPVertex(0x04008430, 13, 0),
@@ -1140,9 +1140,9 @@ Gfx d_course_koopa_troopa_beach_packed_dl_1DA8[] =
     gsSP1Triangle(29, 30, 31, 0),
     gsSPVertex(0x04008700, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
     gsSP2Triangles(18, 19, 20, 0, 21, 22, 23, 0),
     gsSP2Triangles(21, 23, 24, 0, 25, 26, 27, 0),
     gsSP2Triangles(25, 27, 28, 0, 29, 30, 31, 0),
@@ -1173,11 +1173,11 @@ Gfx d_course_koopa_troopa_beach_packed_dl_1E90[] =
     gsSP1Triangle(29, 30, 31, 0),
     gsSPVertex(0x04008BE0, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
     gsSP2Triangles(26, 27, 28, 0, 29, 30, 31, 0),
     gsSPVertex(0x04008DE0, 15, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
@@ -1206,12 +1206,12 @@ Gfx d_course_koopa_troopa_beach_packed_dl_1F78[] =
     gsSP2Triangles(26, 27, 2, 0, 28, 29, 30, 0),
     gsSP1Triangle(28, 30, 31, 0),
     gsSPVertex(0x040090D0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 4, 0),
     gsSP2Triangles(9, 10, 11, 0, 12, 13, 14, 0),
     gsSP2Triangles(12, 14, 15, 0, 16, 17, 18, 0),
     gsSP2Triangles(19, 20, 21, 0, 22, 23, 24, 0),
-    gsSP1Quadrangle(25, 26, 27, 28, 0),
+    gsSP2Triangles(25, 26, 27, 0, 25, 27, 28, 0),
     gsSP1Triangle(29, 30, 31, 0),
     gsSPVertex(0x040092D0, 3, 0),
     gsSP1Triangle(0, 1, 2, 0),
@@ -1492,7 +1492,7 @@ Gfx d_course_koopa_troopa_beach_packed_dl_2698[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04009E20, 6, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
-    gsSP1Quadrangle(4, 5, 3, 0, 0),
+    gsSP2Triangles(4, 5, 3, 0, 4, 3, 0, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1950,10 +1950,10 @@ Gfx d_course_koopa_troopa_beach_packed_dl_31D0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400B300, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1982,10 +1982,10 @@ Gfx d_course_koopa_troopa_beach_packed_dl_32B0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400B580, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2014,10 +2014,10 @@ Gfx d_course_koopa_troopa_beach_packed_dl_3390[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400B7B0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2046,10 +2046,10 @@ Gfx d_course_koopa_troopa_beach_packed_dl_3470[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400BA20, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2078,10 +2078,10 @@ Gfx d_course_koopa_troopa_beach_packed_dl_3550[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400BC60, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2108,8 +2108,8 @@ Gfx d_course_koopa_troopa_beach_packed_dl_3630[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400BDF0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2136,8 +2136,8 @@ Gfx d_course_koopa_troopa_beach_packed_dl_36F0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400BF20, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2168,12 +2168,12 @@ Gfx d_course_koopa_troopa_beach_packed_dl_37B0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400C120, 23, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(12, 16, 17, 18, 0),
-    gsSP1Quadrangle(19, 20, 21, 22, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(12, 16, 17, 0, 12, 17, 18, 0),
+    gsSP2Triangles(19, 20, 21, 0, 19, 21, 22, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2201,8 +2201,8 @@ Gfx d_course_koopa_troopa_beach_packed_dl_38B0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400C3B0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2249,10 +2249,10 @@ Gfx d_course_koopa_troopa_beach_packed_dl_39E8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400C6A0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2301,12 +2301,12 @@ Gfx d_course_koopa_troopa_beach_packed_dl_3B40[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400CB00, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2334,8 +2334,8 @@ Gfx d_course_koopa_troopa_beach_packed_dl_3C38[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400CD70, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2364,10 +2364,10 @@ Gfx d_course_koopa_troopa_beach_packed_dl_3D00[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400CF40, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2397,12 +2397,12 @@ Gfx d_course_koopa_troopa_beach_packed_dl_3DE0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400D1E0, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2452,10 +2452,10 @@ Gfx d_course_koopa_troopa_beach_packed_dl_3F60[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400D660, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2484,10 +2484,10 @@ Gfx d_course_koopa_troopa_beach_packed_dl_4040[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400D8A0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2516,10 +2516,10 @@ Gfx d_course_koopa_troopa_beach_packed_dl_4120[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400DAF0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2548,10 +2548,10 @@ Gfx d_course_koopa_troopa_beach_packed_dl_4200[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400DD60, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2580,10 +2580,10 @@ Gfx d_course_koopa_troopa_beach_packed_dl_42E0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400DFB0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2612,8 +2612,8 @@ Gfx d_course_koopa_troopa_beach_packed_dl_43C0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400E1F0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2629,33 +2629,33 @@ Gfx d_course_koopa_troopa_beach_packed_dl_4490[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400E270, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSP2Triangles(20, 8, 21, 0, 22, 23, 24, 0),
     gsSP2Triangles(22, 24, 25, 0, 26, 27, 28, 0),
     gsSP1Triangle(26, 28, 29, 0),
     gsSPVertex(0x0400E450, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0400E650, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 19, 20, 21, 0),
     gsSP2Triangles(19, 21, 22, 0, 23, 24, 25, 0),
     gsSP2Triangles(24, 26, 27, 0, 28, 29, 30, 0),
     gsSPVertex(0x0400E840, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP1Triangle(0, 4, 5, 0),
     gsSPEndDisplayList(),
 };
@@ -2685,10 +2685,10 @@ Gfx d_course_koopa_troopa_beach_packed_dl_45C8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400E9E0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2716,8 +2716,8 @@ Gfx d_course_koopa_troopa_beach_packed_dl_46A8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400EBD0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2812,9 +2812,9 @@ Gfx d_course_koopa_troopa_beach_packed_dl_4920[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400F1A0, 19, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 15, 16, 17, 0),
     gsSP1Triangle(12, 14, 18, 0),
     gsSPEndDisplayList(),
@@ -2848,8 +2848,8 @@ Gfx d_course_koopa_troopa_beach_packed_dl_4A08[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400F480, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2878,10 +2878,10 @@ Gfx d_course_koopa_troopa_beach_packed_dl_4AF0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400F630, 15, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(8, 12, 13, 14, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(8, 12, 13, 0, 8, 13, 14, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2911,12 +2911,12 @@ Gfx d_course_koopa_troopa_beach_packed_dl_4BD0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400F8D0, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2982,8 +2982,8 @@ Gfx d_course_koopa_troopa_beach_packed_dl_4DD8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400FB00, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3011,8 +3011,8 @@ Gfx d_course_koopa_troopa_beach_packed_dl_4EA0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400FC30, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3039,8 +3039,8 @@ Gfx d_course_koopa_troopa_beach_packed_dl_4F68[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400FD70, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3067,8 +3067,8 @@ Gfx d_course_koopa_troopa_beach_packed_dl_5028[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400FEB0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3095,7 +3095,7 @@ Gfx d_course_koopa_troopa_beach_packed_dl_50E8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400FFD0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3121,7 +3121,7 @@ Gfx d_course_koopa_troopa_beach_packed_dl_51A0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04010050, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3147,7 +3147,7 @@ Gfx d_course_koopa_troopa_beach_packed_dl_5250[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040100F0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3176,9 +3176,9 @@ Gfx d_course_koopa_troopa_beach_packed_dl_5300[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04010260, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3204,7 +3204,7 @@ Gfx d_course_koopa_troopa_beach_packed_dl_53D8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04010380, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3246,7 +3246,7 @@ Gfx d_course_koopa_troopa_beach_packed_dl_54E8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04010450, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3290,9 +3290,9 @@ Gfx d_course_koopa_troopa_beach_packed_dl_55F8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040105E0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3318,7 +3318,7 @@ Gfx d_course_koopa_troopa_beach_packed_dl_56C8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04010700, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3344,7 +3344,7 @@ Gfx d_course_koopa_troopa_beach_packed_dl_5778[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040107A0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3372,9 +3372,9 @@ Gfx d_course_koopa_troopa_beach_packed_dl_5828[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040108D0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3421,8 +3421,8 @@ Gfx d_course_koopa_troopa_beach_packed_dl_5970[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04010B70, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3450,8 +3450,8 @@ Gfx d_course_koopa_troopa_beach_packed_dl_5A38[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04010CC0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3478,7 +3478,7 @@ Gfx d_course_koopa_troopa_beach_packed_dl_5B00[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04010DE0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3494,7 +3494,7 @@ Gfx d_course_koopa_troopa_beach_packed_dl_5BB8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04010E20, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(10, 11, 12, 0, 13, 14, 15, 0),
     gsDPTileSync(),
@@ -3506,9 +3506,9 @@ Gfx d_course_koopa_troopa_beach_packed_dl_5BB8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04010F20, 11, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(5, 8, 9, 10, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(5, 8, 9, 0, 5, 9, 10, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3536,8 +3536,8 @@ Gfx d_course_koopa_troopa_beach_packed_dl_5C88[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04011080, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3564,7 +3564,7 @@ Gfx d_course_koopa_troopa_beach_packed_dl_5D50[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04011190, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3582,7 +3582,7 @@ Gfx d_course_koopa_troopa_beach_packed_dl_5E08[] =
     gsSPVertex(0x040111D0, 31, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 4, 0),
     gsSP2Triangles(5, 6, 7, 0, 8, 9, 10, 0),
-    gsSP1Quadrangle(11, 12, 13, 14, 0),
+    gsSP2Triangles(11, 12, 13, 0, 11, 13, 14, 0),
     gsSP2Triangles(15, 16, 17, 0, 18, 19, 20, 0),
     gsSP2Triangles(18, 20, 21, 0, 22, 23, 24, 0),
     gsSP2Triangles(25, 26, 27, 0, 28, 29, 30, 0),
@@ -3615,7 +3615,7 @@ Gfx d_course_koopa_troopa_beach_packed_dl_5EB0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04011540, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3641,7 +3641,7 @@ Gfx d_course_koopa_troopa_beach_packed_dl_5F60[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040115E0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3676,7 +3676,7 @@ Gfx d_course_koopa_troopa_beach_packed_dl_6078[] =
     gsSPVertex(0x040116B0, 14, 0),
     gsSP2Triangles(0, 1, 2, 0, 2, 3, 4, 0),
     gsSP2Triangles(5, 6, 7, 0, 8, 9, 10, 0),
-    gsSP1Quadrangle(8, 10, 11, 12, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 12, 0),
     gsSP1Triangle(8, 12, 13, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
@@ -3719,7 +3719,7 @@ Gfx d_course_koopa_troopa_beach_packed_dl_61A0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04011850, 10, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
@@ -3761,7 +3761,7 @@ Gfx d_course_koopa_troopa_beach_packed_dl_6268[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04011B00, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3777,7 +3777,7 @@ Gfx d_course_koopa_troopa_beach_packed_dl_6330[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04011B40, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(10, 11, 12, 0, 13, 14, 15, 0),
     gsDPTileSync(),
@@ -3789,8 +3789,8 @@ Gfx d_course_koopa_troopa_beach_packed_dl_6330[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04011C40, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3806,7 +3806,7 @@ Gfx d_course_koopa_troopa_beach_packed_dl_63F8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04011CC0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(10, 11, 12, 0, 13, 14, 15, 0),
     gsDPTileSync(),
@@ -3818,9 +3818,9 @@ Gfx d_course_koopa_troopa_beach_packed_dl_63F8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04011DC0, 11, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(5, 8, 9, 10, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(5, 8, 9, 0, 5, 9, 10, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3965,7 +3965,7 @@ Gfx d_course_koopa_troopa_beach_packed_dl_6810[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x040123C0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -4444,14 +4444,14 @@ Gfx d_course_koopa_troopa_beach_packed_dl_7430[] =
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(6, 7, 8, 0, 9, 10, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPVertex(0x04014150, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(10, 11, 12, 0, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSP2Triangles(20, 21, 22, 0, 23, 24, 25, 0),
     gsSP2Triangles(7, 26, 27, 0, 28, 29, 30, 0),
     gsSPVertex(0x04014340, 31, 0),
@@ -4459,7 +4459,7 @@ Gfx d_course_koopa_troopa_beach_packed_dl_7430[] =
     gsSP2Triangles(6, 7, 8, 0, 9, 10, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 15, 16, 17, 0),
     gsSP2Triangles(18, 19, 20, 0, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSP1Triangle(28, 29, 30, 0),
     gsSPVertex(0x04014530, 3, 0),
     gsSP1Triangle(0, 1, 2, 0),
@@ -5271,7 +5271,7 @@ Gfx d_course_koopa_troopa_beach_packed_dl_8A90[] =
     gsSPVertex(0x0401AB70, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(6, 7, 8, 0, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 19, 20, 21, 0),
     gsSP2Triangles(22, 23, 16, 0, 24, 25, 26, 0),
     gsSP2Triangles(27, 28, 29, 0, 24, 30, 31, 0),
@@ -5279,7 +5279,7 @@ Gfx d_course_koopa_troopa_beach_packed_dl_8A90[] =
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(6, 7, 8, 0, 9, 10, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
     gsSP2Triangles(22, 23, 24, 0, 25, 26, 27, 0),
     gsSP1Triangle(28, 29, 30, 0),
     gsSPVertex(0x0401AF60, 30, 0),
@@ -5287,10 +5287,10 @@ Gfx d_course_koopa_troopa_beach_packed_dl_8A90[] =
     gsSP2Triangles(6, 7, 8, 0, 9, 10, 11, 0),
     gsSP2Triangles(9, 11, 12, 0, 13, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPVertex(0x0401B140, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(10, 11, 12, 0, 13, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 19, 20, 21, 0),
@@ -5298,7 +5298,7 @@ Gfx d_course_koopa_troopa_beach_packed_dl_8A90[] =
     gsSP1Triangle(28, 29, 30, 0),
     gsSPVertex(0x0401B330, 31, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsSP2Triangles(10, 11, 12, 0, 13, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 19, 20, 21, 0),
     gsSP2Triangles(22, 23, 24, 0, 25, 26, 27, 0),
@@ -5529,14 +5529,14 @@ Gfx d_course_koopa_troopa_beach_packed_dl_9188[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401C810, 10, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05006000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401C8B0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5553,14 +5553,14 @@ Gfx d_course_koopa_troopa_beach_packed_dl_9228[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401C8F0, 10, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05006000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401C990, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5577,14 +5577,14 @@ Gfx d_course_koopa_troopa_beach_packed_dl_92C8[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401C9D0, 10, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05006000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401CA70, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5601,14 +5601,14 @@ Gfx d_course_koopa_troopa_beach_packed_dl_9368[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401CAB0, 10, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05006000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401CB50, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5625,14 +5625,14 @@ Gfx d_course_koopa_troopa_beach_packed_dl_9408[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401CB90, 10, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05006000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401CC30, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5649,14 +5649,14 @@ Gfx d_course_koopa_troopa_beach_packed_dl_94A8[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401CC70, 10, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05006000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401CD10, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5673,14 +5673,14 @@ Gfx d_course_koopa_troopa_beach_packed_dl_9548[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401CD50, 10, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05006000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401CDF0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5697,14 +5697,14 @@ Gfx d_course_koopa_troopa_beach_packed_dl_95E8[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401CE30, 10, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05006000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401CED0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5736,10 +5736,10 @@ Gfx d_course_koopa_troopa_beach_packed_dl_96D0[] =
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
     gsSP2Triangles(4, 5, 6, 0, 4, 7, 5, 0),
     gsSP2Triangles(8, 9, 10, 0, 8, 11, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 16, 19, 17, 0),
     gsSP2Triangles(20, 21, 22, 0, 21, 23, 22, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSP2Triangles(28, 29, 30, 0, 29, 31, 30, 0),
     gsSPVertex(0x0401D110, 8, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
@@ -5775,11 +5775,11 @@ Gfx d_course_koopa_troopa_beach_packed_dl_9800[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x0401D3A0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 8, 11, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSP2Triangles(20, 21, 22, 0, 21, 23, 22, 0),
     gsSP2Triangles(24, 25, 26, 0, 25, 27, 26, 0),
     gsSP2Triangles(28, 29, 30, 0, 31, 28, 30, 0),
@@ -5888,9 +5888,9 @@ Gfx d_course_koopa_troopa_beach_packed_dl_9B48[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x0401E4C0, 10, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5909,10 +5909,10 @@ Gfx d_course_koopa_troopa_beach_packed_dl_9B88[] =
     gsSP2Triangles(6, 5, 0, 0, 1, 7, 2, 0),
     gsSP2Triangles(7, 1, 8, 0, 9, 8, 10, 0),
     gsSP2Triangles(7, 8, 9, 0, 8, 11, 10, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 13, 12, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 19, 18, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 13, 0, 16, 13, 12, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 19, 0, 22, 19, 18, 0),
     gsSP2Triangles(24, 25, 26, 0, 27, 24, 26, 0),
     gsSP2Triangles(27, 26, 28, 0, 25, 29, 30, 0),
     gsSP2Triangles(25, 30, 26, 0, 28, 26, 31, 0),
@@ -5929,15 +5929,15 @@ Gfx d_course_koopa_troopa_beach_packed_dl_9B88[] =
     gsSP2Triangles(11, 17, 16, 0, 18, 19, 17, 0),
     gsSP2Triangles(18, 17, 14, 0, 20, 19, 18, 0),
     gsSP2Triangles(21, 22, 18, 0, 22, 20, 18, 0),
-    gsSP1Quadrangle(23, 21, 18, 14, 0),
+    gsSP2Triangles(23, 21, 18, 0, 23, 18, 14, 0),
     gsSP2Triangles(23, 14, 15, 0, 17, 10, 13, 0),
     gsSP2Triangles(17, 13, 14, 0, 10, 1, 5, 0),
     gsSP2Triangles(10, 5, 13, 0, 5, 4, 6, 0),
     gsSP2Triangles(5, 6, 9, 0, 24, 19, 25, 0),
     gsSP2Triangles(25, 19, 20, 0, 26, 19, 24, 0),
-    gsSP1Quadrangle(17, 19, 26, 16, 0),
-    gsSP1Quadrangle(24, 21, 23, 26, 0),
-    gsSP1Quadrangle(16, 26, 23, 15, 0),
+    gsSP2Triangles(17, 19, 26, 0, 17, 26, 16, 0),
+    gsSP2Triangles(24, 21, 23, 0, 24, 23, 26, 0),
+    gsSP2Triangles(16, 26, 23, 0, 16, 23, 15, 0),
     gsSP2Triangles(27, 28, 4, 0, 4, 28, 7, 0),
     gsSP1Triangle(4, 7, 6, 0),
     gsSPEndDisplayList(),
@@ -5984,30 +5984,30 @@ Gfx d_course_koopa_troopa_beach_packed_dl_9D58[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401EA60, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
     gsSP2Triangles(1, 6, 2, 0, 6, 7, 4, 0),
     gsSP2Triangles(6, 4, 2, 0, 4, 8, 9, 0),
     gsSP2Triangles(4, 9, 5, 0, 7, 8, 4, 0),
-    gsSP1Quadrangle(5, 10, 11, 3, 0),
-    gsSP1Quadrangle(9, 12, 10, 5, 0),
-    gsSP1Quadrangle(13, 0, 3, 11, 0),
-    gsSP1Quadrangle(14, 13, 11, 15, 0),
-    gsSP1Quadrangle(11, 10, 16, 15, 0),
-    gsSP1Quadrangle(10, 12, 17, 16, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 19, 18, 0),
-    gsSP1Quadrangle(23, 24, 25, 19, 0),
-    gsSP1Quadrangle(19, 25, 26, 20, 0),
-    gsSP1Quadrangle(26, 27, 28, 20, 0),
-    gsSP1Quadrangle(20, 28, 29, 21, 0),
-    gsSP1Quadrangle(30, 31, 21, 29, 0),
+    gsSP2Triangles(5, 10, 11, 0, 5, 11, 3, 0),
+    gsSP2Triangles(9, 12, 10, 0, 9, 10, 5, 0),
+    gsSP2Triangles(13, 0, 3, 0, 13, 3, 11, 0),
+    gsSP2Triangles(14, 13, 11, 0, 14, 11, 15, 0),
+    gsSP2Triangles(11, 10, 16, 0, 11, 16, 15, 0),
+    gsSP2Triangles(10, 12, 17, 0, 10, 17, 16, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 19, 0, 22, 19, 18, 0),
+    gsSP2Triangles(23, 24, 25, 0, 23, 25, 19, 0),
+    gsSP2Triangles(19, 25, 26, 0, 19, 26, 20, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 20, 0),
+    gsSP2Triangles(20, 28, 29, 0, 20, 29, 21, 0),
+    gsSP2Triangles(30, 31, 21, 0, 30, 21, 29, 0),
     gsSPVertex(0x0401EC60, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 6, 9, 5, 0),
-    gsSP1Quadrangle(4, 11, 10, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 6, 9, 0, 10, 9, 5, 0),
+    gsSP2Triangles(4, 11, 10, 0, 4, 10, 5, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6855,7 +6855,7 @@ Gfx d_course_koopa_troopa_beach_packed_dl_AFC8[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04024170, 12, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 2, 1, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 10, 11, 8, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
diff --git a/courses/mushroom_cup/luigi_raceway/course_data.inc.c b/courses/mushroom_cup/luigi_raceway/course_data.inc.c
index 09bbc1b39..0ede20987 100644
--- a/courses/mushroom_cup/luigi_raceway/course_data.inc.c
+++ b/courses/mushroom_cup/luigi_raceway/course_data.inc.c
@@ -6713,10 +6713,10 @@ Gfx d_course_luigi_raceway_dl_F588[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(d_course_luigi_raceway_basket_model_lod2, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6754,11 +6754,11 @@ Gfx d_course_luigi_raceway_dl_F660[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(d_course_luigi_raceway_unknown_model1, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 2, 5, 0, 6, 5, 2, 0),
-    gsSP1Quadrangle(7, 8, 9, 10, 0),
-    gsSP1Quadrangle(11, 12, 13, 14, 0),
-    gsSP1Quadrangle(15, 16, 17, 18, 0),
+    gsSP2Triangles(7, 8, 9, 0, 7, 9, 10, 0),
+    gsSP2Triangles(11, 12, 13, 0, 11, 13, 14, 0),
+    gsSP2Triangles(15, 16, 17, 0, 15, 17, 18, 0),
     gsSP2Triangles(6, 19, 5, 0, 19, 4, 5, 0),
     gsSPEndDisplayList(),
 };
@@ -6790,14 +6790,14 @@ Gfx d_course_luigi_raceway_dl_F728[] =
     gsSP2Triangles(6, 7, 8, 0, 9, 10, 11, 0),
     gsSP2Triangles(9, 11, 12, 0, 10, 13, 14, 0),
     gsSP2Triangles(12, 11, 15, 0, 16, 17, 18, 0),
-    gsSP1Quadrangle(19, 20, 21, 22, 0),
+    gsSP2Triangles(19, 20, 21, 0, 19, 21, 22, 0),
     gsSP2Triangles(22, 21, 23, 0, 24, 25, 9, 0),
     gsSP2Triangles(24, 26, 25, 0, 9, 25, 10, 0),
     gsSP2Triangles(27, 21, 28, 0, 27, 23, 21, 0),
     gsSP2Triangles(28, 21, 20, 0, 23, 29, 22, 0),
     gsSP1Triangle(6, 30, 31, 0),
     gsSPVertex(d_course_luigi_raceway_unknown_model3, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(1, 4, 5, 0, 3, 2, 6, 0),
     gsSP2Triangles(7, 8, 9, 0, 10, 11, 12, 0),
     gsSP2Triangles(10, 12, 13, 0, 11, 14, 15, 0),
@@ -6818,7 +6818,7 @@ Gfx d_course_luigi_raceway_dl_F728[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(d_course_luigi_raceway_unknown_model5, 27, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(3, 2, 4, 0, 5, 2, 6, 0),
     gsSP2Triangles(5, 4, 2, 0, 4, 7, 3, 0),
     gsSP2Triangles(6, 2, 1, 0, 8, 9, 10, 0),
@@ -6827,10 +6827,10 @@ Gfx d_course_luigi_raceway_dl_F728[] =
     gsSP2Triangles(18, 16, 15, 0, 18, 4, 16, 0),
     gsSP2Triangles(6, 19, 8, 0, 6, 1, 19, 0),
     gsSP2Triangles(1, 0, 20, 0, 8, 19, 11, 0),
-    gsSP1Quadrangle(12, 11, 19, 20, 0),
+    gsSP2Triangles(12, 11, 19, 0, 12, 19, 20, 0),
     gsSP2Triangles(20, 19, 1, 0, 21, 16, 5, 0),
     gsSP2Triangles(5, 16, 4, 0, 21, 17, 16, 0),
-    gsSP1Quadrangle(10, 14, 22, 21, 0),
+    gsSP2Triangles(10, 14, 22, 0, 10, 22, 21, 0),
     gsSP2Triangles(14, 23, 24, 0, 21, 22, 17, 0),
     gsSP2Triangles(17, 25, 15, 0, 23, 9, 26, 0),
     gsSP2Triangles(23, 14, 9, 0, 26, 9, 11, 0),
@@ -6872,7 +6872,7 @@ Gfx d_course_luigi_raceway_dl_F970[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(d_course_luigi_raceway_basket_model_lod1, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6911,16 +6911,16 @@ Gfx d_course_luigi_raceway_dl_FA30[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(d_course_luigi_raceway_unknown_model6, 12, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(6, 9, 10, 11, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(6, 9, 10, 0, 6, 10, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, d_course_luigi_raceway_sign_right),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(d_course_luigi_raceway_unknown_model7, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(0, 3, 4, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6994,9 +6994,9 @@ Gfx d_course_luigi_raceway_dl_FC70[] =
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x00FC),
     gsDPLoadTextureBlock(0x03009000, G_IM_FMT_CI, G_IM_SIZ_8b, 32, 64, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD),
     gsSPVertex(d_course_luigi_raceway_tree_model, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPLoadTextureBlock(0x03009800, G_IM_FMT_CI, G_IM_SIZ_8b, 32, 64, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPEndDisplayList(),
 };
diff --git a/courses/mushroom_cup/luigi_raceway/packed.inc.c b/courses/mushroom_cup/luigi_raceway/packed.inc.c
index aa6409bf5..f12cd9755 100644
--- a/courses/mushroom_cup/luigi_raceway/packed.inc.c
+++ b/courses/mushroom_cup/luigi_raceway/packed.inc.c
@@ -17,8 +17,8 @@ Gfx d_course_luigi_raceway_packed_dl_0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000000, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -40,8 +40,8 @@ Gfx d_course_luigi_raceway_packed_dl_78[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000080, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -76,10 +76,10 @@ Gfx d_course_luigi_raceway_packed_dl_118[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000100, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -95,10 +95,10 @@ Gfx d_course_luigi_raceway_packed_dl_190[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000200, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -114,10 +114,10 @@ Gfx d_course_luigi_raceway_packed_dl_208[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000300, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -133,10 +133,10 @@ Gfx d_course_luigi_raceway_packed_dl_280[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000400, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -152,10 +152,10 @@ Gfx d_course_luigi_raceway_packed_dl_2F8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000500, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -171,10 +171,10 @@ Gfx d_course_luigi_raceway_packed_dl_370[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000600, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -190,8 +190,8 @@ Gfx d_course_luigi_raceway_packed_dl_3E8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000700, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -207,8 +207,8 @@ Gfx d_course_luigi_raceway_packed_dl_450[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000780, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -224,9 +224,9 @@ Gfx d_course_luigi_raceway_packed_dl_4B8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000800, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -242,10 +242,10 @@ Gfx d_course_luigi_raceway_packed_dl_528[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040008C0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -261,9 +261,9 @@ Gfx d_course_luigi_raceway_packed_dl_5A0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040009C0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -279,10 +279,10 @@ Gfx d_course_luigi_raceway_packed_dl_610[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000A80, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -298,10 +298,10 @@ Gfx d_course_luigi_raceway_packed_dl_688[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000B80, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -317,10 +317,10 @@ Gfx d_course_luigi_raceway_packed_dl_700[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000C80, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -336,10 +336,10 @@ Gfx d_course_luigi_raceway_packed_dl_778[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000D80, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -355,8 +355,8 @@ Gfx d_course_luigi_raceway_packed_dl_7F0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000E80, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -372,10 +372,10 @@ Gfx d_course_luigi_raceway_packed_dl_858[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000F00, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -391,8 +391,8 @@ Gfx d_course_luigi_raceway_packed_dl_8D0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04001000, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -408,9 +408,9 @@ Gfx d_course_luigi_raceway_packed_dl_938[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04001080, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -426,10 +426,10 @@ Gfx d_course_luigi_raceway_packed_dl_9A8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04001140, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -445,10 +445,10 @@ Gfx d_course_luigi_raceway_packed_dl_A20[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04001240, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -482,8 +482,8 @@ Gfx d_course_luigi_raceway_packed_dl_B48[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x04001340, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 1, 0, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
@@ -494,8 +494,8 @@ Gfx d_course_luigi_raceway_packed_dl_B48[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040013A0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -503,8 +503,8 @@ Gfx d_course_luigi_raceway_packed_dl_BD0[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x04001420, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
@@ -515,8 +515,8 @@ Gfx d_course_luigi_raceway_packed_dl_BD0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04001480, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -524,8 +524,8 @@ Gfx d_course_luigi_raceway_packed_dl_C58[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x04001500, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
@@ -536,8 +536,8 @@ Gfx d_course_luigi_raceway_packed_dl_C58[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04001560, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -545,8 +545,8 @@ Gfx d_course_luigi_raceway_packed_dl_CE0[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x040015E0, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
@@ -557,8 +557,8 @@ Gfx d_course_luigi_raceway_packed_dl_CE0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04001640, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -566,8 +566,8 @@ Gfx d_course_luigi_raceway_packed_dl_D68[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x040016C0, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
@@ -578,8 +578,8 @@ Gfx d_course_luigi_raceway_packed_dl_D68[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04001720, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -587,8 +587,8 @@ Gfx d_course_luigi_raceway_packed_dl_DF0[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x040017A0, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 1, 0, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
@@ -599,8 +599,8 @@ Gfx d_course_luigi_raceway_packed_dl_DF0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04001800, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -608,8 +608,8 @@ Gfx d_course_luigi_raceway_packed_dl_E78[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x04001880, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
@@ -620,8 +620,8 @@ Gfx d_course_luigi_raceway_packed_dl_E78[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040018E0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -629,8 +629,8 @@ Gfx d_course_luigi_raceway_packed_dl_F00[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x04001960, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
@@ -641,8 +641,8 @@ Gfx d_course_luigi_raceway_packed_dl_F00[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040019C0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -650,7 +650,7 @@ Gfx d_course_luigi_raceway_packed_dl_F88[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x04001A40, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
@@ -661,7 +661,7 @@ Gfx d_course_luigi_raceway_packed_dl_F88[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04001A80, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -669,8 +669,8 @@ Gfx d_course_luigi_raceway_packed_dl_1000[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x04001AC0, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
@@ -681,8 +681,8 @@ Gfx d_course_luigi_raceway_packed_dl_1000[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04001B20, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -690,8 +690,8 @@ Gfx d_course_luigi_raceway_packed_dl_1088[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x04001BA0, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
@@ -702,8 +702,8 @@ Gfx d_course_luigi_raceway_packed_dl_1088[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04001C00, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -711,10 +711,10 @@ Gfx d_course_luigi_raceway_packed_dl_1110[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x04001C80, 10, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(3, 2, 8, 9, 0),
-    gsSP1Quadrangle(9, 8, 5, 4, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(3, 2, 8, 0, 3, 8, 9, 0),
+    gsSP2Triangles(9, 8, 5, 0, 9, 5, 4, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
@@ -725,10 +725,10 @@ Gfx d_course_luigi_raceway_packed_dl_1110[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04001D20, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -736,10 +736,10 @@ Gfx d_course_luigi_raceway_packed_dl_11B8[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x04001E20, 10, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(7, 6, 8, 9, 0),
-    gsSP1Quadrangle(9, 8, 1, 0, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(7, 6, 8, 0, 7, 8, 9, 0),
+    gsSP2Triangles(9, 8, 1, 0, 9, 1, 0, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
@@ -750,10 +750,10 @@ Gfx d_course_luigi_raceway_packed_dl_11B8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04001EC0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -761,10 +761,10 @@ Gfx d_course_luigi_raceway_packed_dl_1260[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x04001FC0, 10, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(7, 6, 8, 9, 0),
-    gsSP1Quadrangle(9, 8, 1, 0, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(7, 6, 8, 0, 7, 8, 9, 0),
+    gsSP2Triangles(9, 8, 1, 0, 9, 1, 0, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
@@ -775,10 +775,10 @@ Gfx d_course_luigi_raceway_packed_dl_1260[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04002060, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -786,10 +786,10 @@ Gfx d_course_luigi_raceway_packed_dl_1308[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x04002160, 10, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(7, 6, 8, 9, 0),
-    gsSP1Quadrangle(9, 8, 1, 0, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(7, 6, 8, 0, 7, 8, 9, 0),
+    gsSP2Triangles(9, 8, 1, 0, 9, 1, 0, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
@@ -800,10 +800,10 @@ Gfx d_course_luigi_raceway_packed_dl_1308[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04002200, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -811,8 +811,8 @@ Gfx d_course_luigi_raceway_packed_dl_13B0[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x04002300, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 1, 0, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
@@ -823,8 +823,8 @@ Gfx d_course_luigi_raceway_packed_dl_13B0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04002360, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -832,10 +832,10 @@ Gfx d_course_luigi_raceway_packed_dl_1438[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x040023E0, 10, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
-    gsSP1Quadrangle(5, 4, 6, 7, 0),
-    gsSP1Quadrangle(7, 6, 8, 9, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
+    gsSP2Triangles(5, 4, 6, 0, 5, 6, 7, 0),
+    gsSP2Triangles(7, 6, 8, 0, 7, 8, 9, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
@@ -846,10 +846,10 @@ Gfx d_course_luigi_raceway_packed_dl_1438[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04002480, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -857,7 +857,7 @@ Gfx d_course_luigi_raceway_packed_dl_14E0[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x04002580, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
@@ -868,7 +868,7 @@ Gfx d_course_luigi_raceway_packed_dl_14E0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040025C0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -876,8 +876,8 @@ Gfx d_course_luigi_raceway_packed_dl_1558[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x04002600, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 1, 0, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
@@ -888,8 +888,8 @@ Gfx d_course_luigi_raceway_packed_dl_1558[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04002660, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -897,10 +897,10 @@ Gfx d_course_luigi_raceway_packed_dl_15E0[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x040026E0, 10, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(7, 6, 8, 9, 0),
-    gsSP1Quadrangle(9, 8, 1, 0, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(7, 6, 8, 0, 7, 8, 9, 0),
+    gsSP2Triangles(9, 8, 1, 0, 9, 1, 0, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
@@ -911,10 +911,10 @@ Gfx d_course_luigi_raceway_packed_dl_15E0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04002780, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -922,10 +922,10 @@ Gfx d_course_luigi_raceway_packed_dl_1688[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x04002880, 10, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
-    gsSP1Quadrangle(5, 4, 6, 7, 0),
-    gsSP1Quadrangle(7, 6, 8, 9, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
+    gsSP2Triangles(5, 4, 6, 0, 5, 6, 7, 0),
+    gsSP2Triangles(7, 6, 8, 0, 7, 8, 9, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
@@ -936,10 +936,10 @@ Gfx d_course_luigi_raceway_packed_dl_1688[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04002920, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1016,7 +1016,7 @@ Gfx d_course_luigi_raceway_packed_dl_18B8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04002AF0, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(0, 4, 1, 0, 0, 5, 4, 0),
     gsSPEndDisplayList(),
 };
@@ -1074,7 +1074,7 @@ Gfx d_course_luigi_raceway_packed_dl_1A28[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04002C40, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 5, 7, 6, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05003800),
     gsDPTileSync(),
@@ -1098,7 +1098,7 @@ Gfx d_course_luigi_raceway_packed_dl_1AC8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04002D20, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1115,14 +1115,14 @@ Gfx d_course_luigi_raceway_packed_dl_1B28[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04002D60, 8, 0),
     gsSP2Triangles(0, 1, 2, 0, 2, 3, 0, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05003800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04002DE0, 7, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(0, 3, 4, 0, 1, 5, 6, 0),
     gsSP2Triangles(1, 6, 2, 0, 6, 3, 2, 0),
     gsSPEndDisplayList(),
@@ -1140,7 +1140,7 @@ Gfx d_course_luigi_raceway_packed_dl_1BD8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04002E50, 9, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(1, 4, 2, 0, 4, 5, 2, 0),
     gsSP2Triangles(6, 7, 3, 0, 7, 8, 3, 0),
     gsSP1Triangle(0, 3, 8, 0),
@@ -1151,7 +1151,7 @@ Gfx d_course_luigi_raceway_packed_dl_1BD8[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04002EE0, 6, 0),
     gsSP2Triangles(0, 1, 2, 0, 2, 1, 3, 0),
-    gsSP1Quadrangle(3, 1, 4, 5, 0),
+    gsSP2Triangles(3, 1, 4, 0, 3, 4, 5, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1202,7 +1202,7 @@ Gfx d_course_luigi_raceway_packed_dl_1D68[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04003020, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05003800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
@@ -1227,7 +1227,7 @@ Gfx d_course_luigi_raceway_packed_dl_1E10[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040030F0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1251,7 +1251,7 @@ Gfx d_course_luigi_raceway_packed_dl_1E70[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040031F0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 5, 7, 6, 0),
     gsSPEndDisplayList(),
 };
@@ -2447,7 +2447,7 @@ Gfx d_course_luigi_raceway_packed_dl_3C40[] =
     gsSPVertex(0x04008390, 31, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(3, 5, 6, 0, 7, 1, 8, 0),
-    gsSP1Quadrangle(9, 10, 11, 12, 0),
+    gsSP2Triangles(9, 10, 11, 0, 9, 11, 12, 0),
     gsSP2Triangles(13, 14, 15, 0, 16, 17, 18, 0),
     gsSP2Triangles(19, 18, 20, 0, 21, 22, 23, 0),
     gsSP2Triangles(24, 21, 23, 0, 25, 26, 27, 0),
@@ -2540,28 +2540,28 @@ Gfx d_course_luigi_raceway_packed_dl_3EB8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04008900, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04008B00, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04008D00, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2577,44 +2577,44 @@ Gfx d_course_luigi_raceway_packed_dl_3FC0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04008E00, 23, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 7, 10, 0),
-    gsSP1Quadrangle(11, 12, 13, 14, 0),
-    gsSP1Quadrangle(15, 16, 17, 18, 0),
-    gsSP1Quadrangle(19, 20, 21, 22, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 7, 0, 8, 7, 10, 0),
+    gsSP2Triangles(11, 12, 13, 0, 11, 13, 14, 0),
+    gsSP2Triangles(15, 16, 17, 0, 15, 17, 18, 0),
+    gsSP2Triangles(19, 20, 21, 0, 19, 21, 22, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500B000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04008F70, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04009170, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 4, 7, 5, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04009370, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 19, 30, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 19, 0, 28, 19, 30, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2630,56 +2630,56 @@ Gfx d_course_luigi_raceway_packed_dl_4148[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04009560, 21, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 2, 5, 6, 0),
-    gsSP1Quadrangle(7, 8, 9, 10, 0),
-    gsSP1Quadrangle(11, 12, 13, 14, 0),
-    gsSP1Quadrangle(15, 16, 17, 18, 0),
-    gsSP1Quadrangle(10, 19, 20, 17, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 2, 5, 0, 4, 5, 6, 0),
+    gsSP2Triangles(7, 8, 9, 0, 7, 9, 10, 0),
+    gsSP2Triangles(11, 12, 13, 0, 11, 13, 14, 0),
+    gsSP2Triangles(15, 16, 17, 0, 15, 17, 18, 0),
+    gsSP2Triangles(10, 19, 20, 0, 10, 20, 17, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500B000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040096B0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x040098B0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04009AB0, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 2, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 2, 0),
     gsSPVertex(0x04009CA0, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 3, 0),
-    gsSP1Quadrangle(7, 8, 9, 10, 0),
-    gsSP1Quadrangle(11, 12, 13, 14, 0),
-    gsSP1Quadrangle(15, 16, 17, 18, 0),
-    gsSP1Quadrangle(19, 20, 21, 22, 0),
-    gsSP1Quadrangle(23, 24, 25, 26, 0),
-    gsSP1Quadrangle(27, 28, 29, 26, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 3, 0),
+    gsSP2Triangles(7, 8, 9, 0, 7, 9, 10, 0),
+    gsSP2Triangles(11, 12, 13, 0, 11, 13, 14, 0),
+    gsSP2Triangles(15, 16, 17, 0, 15, 17, 18, 0),
+    gsSP2Triangles(19, 20, 21, 0, 19, 21, 22, 0),
+    gsSP2Triangles(23, 24, 25, 0, 23, 25, 26, 0),
+    gsSP2Triangles(27, 28, 29, 0, 27, 29, 26, 0),
     gsSPVertex(0x04009E80, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2695,56 +2695,56 @@ Gfx d_course_luigi_raceway_packed_dl_4330[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04009F00, 11, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 1, 6, 0),
-    gsSP1Quadrangle(7, 8, 9, 10, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 1, 0, 4, 1, 6, 0),
+    gsSP2Triangles(7, 8, 9, 0, 7, 9, 10, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500B000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04009FB0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0400A1B0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0400A3B0, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 1, 6, 0),
-    gsSP1Quadrangle(7, 8, 9, 10, 0),
-    gsSP1Quadrangle(11, 12, 13, 14, 0),
-    gsSP1Quadrangle(15, 16, 17, 18, 0),
-    gsSP1Quadrangle(19, 20, 21, 22, 0),
-    gsSP1Quadrangle(23, 24, 25, 26, 0),
-    gsSP1Quadrangle(27, 28, 29, 30, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 1, 0, 4, 1, 6, 0),
+    gsSP2Triangles(7, 8, 9, 0, 7, 9, 10, 0),
+    gsSP2Triangles(11, 12, 13, 0, 11, 13, 14, 0),
+    gsSP2Triangles(15, 16, 17, 0, 15, 17, 18, 0),
+    gsSP2Triangles(19, 20, 21, 0, 19, 21, 22, 0),
+    gsSP2Triangles(23, 24, 25, 0, 23, 25, 26, 0),
+    gsSP2Triangles(27, 28, 29, 0, 27, 29, 30, 0),
     gsSPVertex(0x0400A5A0, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 3, 14, 0),
-    gsSP1Quadrangle(15, 16, 17, 18, 0),
-    gsSP1Quadrangle(19, 20, 21, 22, 0),
-    gsSP1Quadrangle(23, 24, 25, 26, 0),
-    gsSP1Quadrangle(27, 28, 29, 30, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 3, 0, 12, 3, 14, 0),
+    gsSP2Triangles(15, 16, 17, 0, 15, 17, 18, 0),
+    gsSP2Triangles(19, 20, 21, 0, 19, 21, 22, 0),
+    gsSP2Triangles(23, 24, 25, 0, 23, 25, 26, 0),
+    gsSP2Triangles(27, 28, 29, 0, 27, 29, 30, 0),
     gsSPVertex(0x0400A790, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2769,9 +2769,9 @@ Gfx d_course_luigi_raceway_packed_dl_4540[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400A8D0, 13, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSP1Triangle(10, 12, 11, 0),
     gsSPEndDisplayList(),
 };
@@ -2804,8 +2804,8 @@ Gfx d_course_luigi_raceway_packed_dl_45B8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400AB40, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 0, 3, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 0, 3, 0, 4, 3, 5, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2821,18 +2821,18 @@ Gfx d_course_luigi_raceway_packed_dl_46A0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400ABA0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05019800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400AC60, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -2881,9 +2881,9 @@ Gfx d_course_luigi_raceway_packed_dl_4880[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x0400AF50, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(0, 3, 4, 0, 3, 5, 6, 0),
-    gsSP1Quadrangle(3, 6, 7, 4, 0),
+    gsSP2Triangles(3, 6, 7, 0, 3, 7, 4, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 6, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD),
@@ -2894,18 +2894,18 @@ Gfx d_course_luigi_raceway_packed_dl_4880[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x0400AFD0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05007800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x0400B090, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2916,7 +2916,7 @@ Gfx d_course_luigi_raceway_packed_dl_4960[] =
     gsSPVertex(0x0400B150, 15, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 0, 2, 0),
     gsSP2Triangles(4, 3, 2, 0, 5, 4, 2, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsSP2Triangles(10, 11, 12, 0, 10, 13, 11, 0),
     gsSP1Triangle(13, 14, 11, 0),
     gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
@@ -2936,9 +2936,9 @@ Gfx d_course_luigi_raceway_packed_dl_49B8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400B240, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
-    gsSP1Quadrangle(5, 4, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
+    gsSP2Triangles(5, 4, 6, 0, 5, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2956,7 +2956,7 @@ Gfx d_course_luigi_raceway_packed_dl_4A28[] =
     gsSPVertex(0x0400B2C0, 26, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
     gsSP2Triangles(4, 0, 2, 0, 2, 1, 5, 0),
-    gsSP1Quadrangle(6, 4, 7, 8, 0),
+    gsSP2Triangles(6, 4, 7, 0, 6, 7, 8, 0),
     gsSP2Triangles(9, 6, 8, 0, 8, 7, 10, 0),
     gsSP2Triangles(6, 11, 4, 0, 12, 13, 14, 0),
     gsSP2Triangles(15, 13, 12, 0, 16, 15, 12, 0),
@@ -2998,7 +2998,7 @@ Gfx d_course_luigi_raceway_packed_dl_4B10[] =
     gsSP2Triangles(4, 20, 21, 0, 3, 4, 21, 0),
     gsSP2Triangles(22, 23, 24, 0, 23, 25, 26, 0),
     gsSP2Triangles(25, 20, 26, 0, 26, 20, 5, 0),
-    gsSP1Quadrangle(27, 8, 7, 28, 0),
+    gsSP2Triangles(27, 8, 7, 0, 27, 7, 28, 0),
     gsSP2Triangles(29, 27, 28, 0, 30, 5, 2, 0),
     gsSP2Triangles(15, 30, 14, 0, 30, 2, 14, 0),
     gsSP2Triangles(14, 2, 1, 0, 31, 15, 13, 0),
@@ -3033,15 +3033,15 @@ Gfx d_course_luigi_raceway_packed_dl_4C28[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400B740, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 9, 11, 12, 0),
     gsSP2Triangles(9, 12, 10, 0, 13, 14, 15, 0),
     gsSP2Triangles(13, 15, 16, 0, 17, 18, 19, 0),
     gsSP2Triangles(17, 19, 20, 0, 11, 21, 12, 0),
-    gsSP1Quadrangle(10, 22, 23, 24, 0),
-    gsSP1Quadrangle(25, 22, 26, 27, 0),
-    gsSP1Quadrangle(28, 23, 29, 30, 0),
+    gsSP2Triangles(10, 22, 23, 0, 10, 23, 24, 0),
+    gsSP2Triangles(25, 22, 26, 0, 25, 26, 27, 0),
+    gsSP2Triangles(28, 23, 29, 0, 28, 29, 30, 0),
     gsSP1Triangle(27, 26, 31, 0),
     gsSPVertex(0x0400B940, 14, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
@@ -3057,42 +3057,42 @@ Gfx d_course_luigi_raceway_packed_dl_4C28[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400BA20, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05010800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400BA60, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05011800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400BAA0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05012800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400BAE0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05013800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400BB20, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05014800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400BB60, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -3102,7 +3102,7 @@ Gfx d_course_luigi_raceway_packed_dl_4C28[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400BBA0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3129,30 +3129,30 @@ Gfx d_course_luigi_raceway_packed_dl_4F20[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400BBE0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05004800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400BCE0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05005000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400BDE0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3168,19 +3168,19 @@ Gfx d_course_luigi_raceway_packed_dl_5038[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400BEE0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05004800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400BFE0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05005000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
@@ -3201,14 +3201,14 @@ Gfx d_course_luigi_raceway_packed_dl_5038[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400C1B0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05001000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400C1F0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3224,28 +3224,28 @@ Gfx d_course_luigi_raceway_packed_dl_51D8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400C230, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05017800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400C270, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0501C800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400C2B0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0501D800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400C2F0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -3255,29 +3255,29 @@ Gfx d_course_luigi_raceway_packed_dl_51D8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400C330, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05004800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400C430, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05005000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400C4B0, 18, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(1, 4, 2, 0, 5, 6, 7, 0),
     gsSP2Triangles(5, 8, 6, 0, 8, 9, 6, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3293,28 +3293,28 @@ Gfx d_course_luigi_raceway_packed_dl_53E0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400C5D0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05019800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400C610, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0501E800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400C650, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0501F800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400C690, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -3324,29 +3324,29 @@ Gfx d_course_luigi_raceway_packed_dl_53E0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400C6D0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05004800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400C7D0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05005000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400C850, 18, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(1, 4, 2, 0, 5, 6, 7, 0),
     gsSP2Triangles(6, 8, 7, 0, 5, 7, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3362,14 +3362,14 @@ Gfx d_course_luigi_raceway_packed_dl_55E8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400C970, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0501B800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400C9B0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -3379,19 +3379,19 @@ Gfx d_course_luigi_raceway_packed_dl_55E8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400C9F0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05004800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400CAF0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05005000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
@@ -3399,7 +3399,7 @@ Gfx d_course_luigi_raceway_packed_dl_55E8[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400CBB0, 17, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 8, 11, 9, 0),
     gsSP2Triangles(12, 9, 11, 0, 13, 14, 15, 0),
     gsSP1Triangle(13, 15, 16, 0),
@@ -3418,30 +3418,30 @@ Gfx d_course_luigi_raceway_packed_dl_5788[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400CCC0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05004800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400CDC0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05005000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400CEC0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3457,30 +3457,30 @@ Gfx d_course_luigi_raceway_packed_dl_58A0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400CFC0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05004800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400D0C0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05005000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400D1C0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3496,27 +3496,27 @@ Gfx d_course_luigi_raceway_packed_dl_59B8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400D2C0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05004800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400D380, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05005000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400D440, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3532,27 +3532,27 @@ Gfx d_course_luigi_raceway_packed_dl_5AB8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400D500, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05004800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400D5C0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05005000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400D680, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3568,30 +3568,30 @@ Gfx d_course_luigi_raceway_packed_dl_5BB8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400D740, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05004800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400D840, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05005000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400D940, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3607,28 +3607,28 @@ Gfx d_course_luigi_raceway_packed_dl_5CD0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400DA40, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0501F800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400DA80, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0501C800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400DAC0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0501D800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400DB00, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -3638,29 +3638,29 @@ Gfx d_course_luigi_raceway_packed_dl_5CD0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400DB40, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05004800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400DC40, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05005000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400DCC0, 18, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(1, 4, 2, 0, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 5, 7, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
+    gsSP2Triangles(8, 5, 7, 0, 8, 7, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3676,28 +3676,28 @@ Gfx d_course_luigi_raceway_packed_dl_5ED8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400DDE0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05019800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400DE20, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0501A800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400DE60, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0501B800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400DEA0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -3707,18 +3707,18 @@ Gfx d_course_luigi_raceway_packed_dl_5ED8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400DEE0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05004800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400DFE0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05005000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
@@ -3728,8 +3728,8 @@ Gfx d_course_luigi_raceway_packed_dl_5ED8[] =
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
     gsSP2Triangles(3, 4, 1, 0, 5, 6, 7, 0),
     gsSP2Triangles(5, 8, 6, 0, 6, 9, 7, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3745,14 +3745,14 @@ Gfx d_course_luigi_raceway_packed_dl_60E0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400E180, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05017800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400E1C0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -3762,29 +3762,29 @@ Gfx d_course_luigi_raceway_packed_dl_60E0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400E200, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05004800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400E300, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05005000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400E380, 18, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 4, 7, 5, 0),
     gsSP2Triangles(5, 8, 6, 0, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 9, 11, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
+    gsSP2Triangles(12, 9, 11, 0, 12, 11, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 6, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x007C),
@@ -3794,14 +3794,14 @@ Gfx d_course_luigi_raceway_packed_dl_60E0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400E4A0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05001000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400E4E0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3817,30 +3817,30 @@ Gfx d_course_luigi_raceway_packed_dl_6300[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400E520, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05004800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400E620, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05005000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400E720, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3856,22 +3856,22 @@ Gfx d_course_luigi_raceway_packed_dl_6418[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400E820, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05004800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400E960, 18, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 9, 8, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 9, 0, 16, 9, 8, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05005000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
@@ -4374,7 +4374,7 @@ Gfx d_course_luigi_raceway_packed_dl_71A0[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040101B0, 8, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4399,7 +4399,7 @@ Gfx d_course_luigi_raceway_packed_dl_7248[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040102D0, 8, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4569,7 +4569,7 @@ Gfx d_course_luigi_raceway_packed_dl_76F8[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04010A90, 6, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
-    gsSP1Quadrangle(4, 0, 2, 5, 0),
+    gsSP2Triangles(4, 0, 2, 0, 4, 2, 5, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500D000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
@@ -4578,7 +4578,7 @@ Gfx d_course_luigi_raceway_packed_dl_76F8[] =
     gsSPVertex(0x04010AF0, 12, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 0, 2, 0),
     gsSP2Triangles(0, 4, 1, 0, 4, 5, 1, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsSP2Triangles(10, 9, 8, 0, 10, 11, 9, 0),
     gsSPEndDisplayList(),
 };
@@ -4597,7 +4597,7 @@ Gfx d_course_luigi_raceway_packed_dl_77B0[] =
     gsSPVertex(0x04010BB0, 12, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
     gsSP2Triangles(1, 4, 3, 0, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsSP2Triangles(8, 10, 9, 0, 10, 11, 9, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500D000),
     gsDPTileSync(),
@@ -4605,7 +4605,7 @@ Gfx d_course_luigi_raceway_packed_dl_77B0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04010C70, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(2, 4, 3, 0, 4, 5, 3, 0),
     gsSP2Triangles(6, 7, 8, 0, 6, 9, 7, 0),
     gsSP2Triangles(7, 10, 8, 0, 10, 11, 8, 0),
@@ -4634,7 +4634,7 @@ Gfx d_course_luigi_raceway_packed_dl_7878[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04010DF0, 14, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 5, 7, 6, 0),
     gsSP2Triangles(8, 9, 10, 0, 8, 11, 9, 0),
     gsSP2Triangles(9, 12, 10, 0, 12, 13, 10, 0),
@@ -4737,10 +4737,10 @@ Gfx d_course_luigi_raceway_packed_dl_7B80[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04011090, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4756,12 +4756,12 @@ Gfx d_course_luigi_raceway_packed_dl_7BF8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04011190, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(2, 12, 13, 3, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(14, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(2, 12, 13, 0, 2, 13, 3, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(14, 17, 18, 0, 14, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4777,9 +4777,9 @@ Gfx d_course_luigi_raceway_packed_dl_7C80[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040112D0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4795,9 +4795,9 @@ Gfx d_course_luigi_raceway_packed_dl_7CF0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04011390, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4813,10 +4813,10 @@ Gfx d_course_luigi_raceway_packed_dl_7D60[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04011450, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4832,10 +4832,10 @@ Gfx d_course_luigi_raceway_packed_dl_7DD8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04011550, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4851,8 +4851,8 @@ Gfx d_course_luigi_raceway_packed_dl_7E50[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04011650, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4880,8 +4880,8 @@ Gfx d_course_luigi_raceway_packed_dl_7EF8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040116D0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 8, 11, 9, 0),
     gsSPEndDisplayList(),
 };
@@ -4898,10 +4898,10 @@ Gfx d_course_luigi_raceway_packed_dl_7F68[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04011790, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4917,8 +4917,8 @@ Gfx d_course_luigi_raceway_packed_dl_7FE0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04011890, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4934,8 +4934,8 @@ Gfx d_course_luigi_raceway_packed_dl_8048[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04011910, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4951,10 +4951,10 @@ Gfx d_course_luigi_raceway_packed_dl_80B0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04011990, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4970,8 +4970,8 @@ Gfx d_course_luigi_raceway_packed_dl_8128[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04011A90, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4987,9 +4987,9 @@ Gfx d_course_luigi_raceway_packed_dl_8190[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04011B10, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5017,23 +5017,23 @@ Gfx d_course_luigi_raceway_packed_dl_8240[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04011BD0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(0, 3, 4, 0, 0, 5, 6, 0),
-    gsSP1Quadrangle(0, 6, 7, 8, 0),
-    gsSP1Quadrangle(0, 8, 9, 10, 0),
-    gsSP1Quadrangle(0, 10, 11, 12, 0),
-    gsSP1Quadrangle(0, 12, 13, 14, 0),
-    gsSP1Quadrangle(0, 14, 15, 16, 0),
-    gsSP1Quadrangle(0, 16, 17, 18, 0),
-    gsSP1Quadrangle(0, 18, 19, 20, 0),
-    gsSP1Quadrangle(0, 20, 21, 22, 0),
-    gsSP1Quadrangle(0, 22, 23, 24, 0),
-    gsSP1Quadrangle(0, 24, 25, 26, 0),
-    gsSP1Quadrangle(0, 26, 27, 28, 0),
-    gsSP1Quadrangle(0, 28, 29, 30, 0),
+    gsSP2Triangles(0, 6, 7, 0, 0, 7, 8, 0),
+    gsSP2Triangles(0, 8, 9, 0, 0, 9, 10, 0),
+    gsSP2Triangles(0, 10, 11, 0, 0, 11, 12, 0),
+    gsSP2Triangles(0, 12, 13, 0, 0, 13, 14, 0),
+    gsSP2Triangles(0, 14, 15, 0, 0, 15, 16, 0),
+    gsSP2Triangles(0, 16, 17, 0, 0, 17, 18, 0),
+    gsSP2Triangles(0, 18, 19, 0, 0, 19, 20, 0),
+    gsSP2Triangles(0, 20, 21, 0, 0, 21, 22, 0),
+    gsSP2Triangles(0, 22, 23, 0, 0, 23, 24, 0),
+    gsSP2Triangles(0, 24, 25, 0, 0, 25, 26, 0),
+    gsSP2Triangles(0, 26, 27, 0, 0, 27, 28, 0),
+    gsSP2Triangles(0, 28, 29, 0, 0, 29, 30, 0),
     gsSP1Triangle(0, 30, 31, 0),
     gsSPVertex(0x04011DD0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5049,16 +5049,16 @@ Gfx d_course_luigi_raceway_packed_dl_8320[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04011E10, 22, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(0, 3, 4, 5, 0),
-    gsSP1Quadrangle(0, 5, 6, 7, 0),
-    gsSP1Quadrangle(0, 8, 9, 10, 0),
-    gsSP1Quadrangle(0, 10, 11, 12, 0),
-    gsSP1Quadrangle(0, 12, 13, 14, 0),
-    gsSP1Quadrangle(0, 14, 15, 16, 0),
-    gsSP1Quadrangle(0, 16, 17, 18, 0),
-    gsSP1Quadrangle(0, 18, 19, 20, 0),
-    gsSP1Quadrangle(0, 20, 21, 1, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0),
+    gsSP2Triangles(0, 5, 6, 0, 0, 6, 7, 0),
+    gsSP2Triangles(0, 8, 9, 0, 0, 9, 10, 0),
+    gsSP2Triangles(0, 10, 11, 0, 0, 11, 12, 0),
+    gsSP2Triangles(0, 12, 13, 0, 0, 13, 14, 0),
+    gsSP2Triangles(0, 14, 15, 0, 0, 15, 16, 0),
+    gsSP2Triangles(0, 16, 17, 0, 0, 17, 18, 0),
+    gsSP2Triangles(0, 18, 19, 0, 0, 19, 20, 0),
+    gsSP2Triangles(0, 20, 21, 0, 0, 21, 1, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5081,8 +5081,8 @@ Gfx d_course_luigi_raceway_packed_dl_83E0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04011F70, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5098,8 +5098,8 @@ Gfx d_course_luigi_raceway_packed_dl_8448[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04011FF0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5122,7 +5122,7 @@ Gfx d_course_luigi_raceway_packed_dl_84C8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04012070, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5131,7 +5131,7 @@ Gfx d_course_luigi_raceway_packed_dl_8528[] =
     gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x040120B0, 17, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 0, 5, 0, 1, 6, 2, 0),
     gsSP2Triangles(6, 7, 2, 0, 7, 8, 9, 0),
     gsSP2Triangles(6, 8, 7, 0, 9, 8, 10, 0),
@@ -5151,8 +5151,8 @@ Gfx d_course_luigi_raceway_packed_dl_8528[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040121C0, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5168,18 +5168,18 @@ Gfx d_course_luigi_raceway_packed_dl_85F8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04012220, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05019800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040122E0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -5202,7 +5202,7 @@ Gfx d_course_luigi_raceway_packed_dl_85F8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04012460, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5226,8 +5226,8 @@ Gfx d_course_luigi_raceway_packed_dl_8788[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040124A0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5243,8 +5243,8 @@ Gfx d_course_luigi_raceway_packed_dl_87F0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04012520, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5260,8 +5260,8 @@ Gfx d_course_luigi_raceway_packed_dl_8858[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040125A0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5277,8 +5277,8 @@ Gfx d_course_luigi_raceway_packed_dl_88C0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04012620, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5294,8 +5294,8 @@ Gfx d_course_luigi_raceway_packed_dl_8928[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040126A0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5311,8 +5311,8 @@ Gfx d_course_luigi_raceway_packed_dl_8990[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04012720, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5328,7 +5328,7 @@ Gfx d_course_luigi_raceway_packed_dl_89F8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040127A0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5344,7 +5344,7 @@ Gfx d_course_luigi_raceway_packed_dl_8A58[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040127E0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5360,7 +5360,7 @@ Gfx d_course_luigi_raceway_packed_dl_8AB8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04012820, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5376,8 +5376,8 @@ Gfx d_course_luigi_raceway_packed_dl_8B18[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04012860, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5393,8 +5393,8 @@ Gfx d_course_luigi_raceway_packed_dl_8B80[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040128E0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5410,8 +5410,8 @@ Gfx d_course_luigi_raceway_packed_dl_8BE8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04012960, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5427,8 +5427,8 @@ Gfx d_course_luigi_raceway_packed_dl_8C50[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040129E0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5444,8 +5444,8 @@ Gfx d_course_luigi_raceway_packed_dl_8CB8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04012A60, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5461,8 +5461,8 @@ Gfx d_course_luigi_raceway_packed_dl_8D20[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04012AE0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5478,7 +5478,7 @@ Gfx d_course_luigi_raceway_packed_dl_8D88[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04012B60, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5494,8 +5494,8 @@ Gfx d_course_luigi_raceway_packed_dl_8DE8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04012BA0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5511,7 +5511,7 @@ Gfx d_course_luigi_raceway_packed_dl_8E50[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04012C20, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5527,8 +5527,8 @@ Gfx d_course_luigi_raceway_packed_dl_8EB0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04012C60, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5544,8 +5544,8 @@ Gfx d_course_luigi_raceway_packed_dl_8F18[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04012CE0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5561,8 +5561,8 @@ Gfx d_course_luigi_raceway_packed_dl_8F80[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04012D60, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5596,8 +5596,8 @@ Gfx d_course_luigi_raceway_packed_dl_9098[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x04012DE0, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 1, 0, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
@@ -5608,8 +5608,8 @@ Gfx d_course_luigi_raceway_packed_dl_9098[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04012E40, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5617,8 +5617,8 @@ Gfx d_course_luigi_raceway_packed_dl_9120[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x04012EC0, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
@@ -5629,8 +5629,8 @@ Gfx d_course_luigi_raceway_packed_dl_9120[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04012F20, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5638,8 +5638,8 @@ Gfx d_course_luigi_raceway_packed_dl_91A8[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x04012FA0, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
@@ -5650,8 +5650,8 @@ Gfx d_course_luigi_raceway_packed_dl_91A8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04013000, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5659,8 +5659,8 @@ Gfx d_course_luigi_raceway_packed_dl_9230[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x04013080, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
@@ -5671,8 +5671,8 @@ Gfx d_course_luigi_raceway_packed_dl_9230[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040130E0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5680,8 +5680,8 @@ Gfx d_course_luigi_raceway_packed_dl_92B8[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x04013160, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
@@ -5692,8 +5692,8 @@ Gfx d_course_luigi_raceway_packed_dl_92B8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040131C0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5701,8 +5701,8 @@ Gfx d_course_luigi_raceway_packed_dl_9340[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x04013240, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 1, 0, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
@@ -5713,8 +5713,8 @@ Gfx d_course_luigi_raceway_packed_dl_9340[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040132A0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5722,7 +5722,7 @@ Gfx d_course_luigi_raceway_packed_dl_93C8[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x04013320, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
@@ -5733,7 +5733,7 @@ Gfx d_course_luigi_raceway_packed_dl_93C8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04013360, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5741,7 +5741,7 @@ Gfx d_course_luigi_raceway_packed_dl_9440[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x040133A0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
@@ -5752,7 +5752,7 @@ Gfx d_course_luigi_raceway_packed_dl_9440[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040133E0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5760,7 +5760,7 @@ Gfx d_course_luigi_raceway_packed_dl_94B8[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x04013420, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
@@ -5771,7 +5771,7 @@ Gfx d_course_luigi_raceway_packed_dl_94B8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04013460, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5779,8 +5779,8 @@ Gfx d_course_luigi_raceway_packed_dl_9530[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x040134A0, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
@@ -5791,8 +5791,8 @@ Gfx d_course_luigi_raceway_packed_dl_9530[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04013500, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5800,8 +5800,8 @@ Gfx d_course_luigi_raceway_packed_dl_95B8[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x04013560, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
@@ -5812,8 +5812,8 @@ Gfx d_course_luigi_raceway_packed_dl_95B8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040135C0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5821,8 +5821,8 @@ Gfx d_course_luigi_raceway_packed_dl_9640[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x04013640, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
@@ -5833,8 +5833,8 @@ Gfx d_course_luigi_raceway_packed_dl_9640[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040136A0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5842,8 +5842,8 @@ Gfx d_course_luigi_raceway_packed_dl_96C8[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x04013720, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 1, 0, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
@@ -5854,8 +5854,8 @@ Gfx d_course_luigi_raceway_packed_dl_96C8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04013780, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5863,8 +5863,8 @@ Gfx d_course_luigi_raceway_packed_dl_9750[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x04013800, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 1, 0, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
@@ -5875,8 +5875,8 @@ Gfx d_course_luigi_raceway_packed_dl_9750[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04013860, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5884,8 +5884,8 @@ Gfx d_course_luigi_raceway_packed_dl_97D8[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x040138E0, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 1, 0, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
@@ -5896,8 +5896,8 @@ Gfx d_course_luigi_raceway_packed_dl_97D8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04013940, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5905,7 +5905,7 @@ Gfx d_course_luigi_raceway_packed_dl_9860[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x040139C0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
@@ -5916,7 +5916,7 @@ Gfx d_course_luigi_raceway_packed_dl_9860[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04013A00, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5924,8 +5924,8 @@ Gfx d_course_luigi_raceway_packed_dl_98D8[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x04013A40, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
@@ -5936,8 +5936,8 @@ Gfx d_course_luigi_raceway_packed_dl_98D8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04013AA0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5945,7 +5945,7 @@ Gfx d_course_luigi_raceway_packed_dl_9960[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x04013B20, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
@@ -5956,7 +5956,7 @@ Gfx d_course_luigi_raceway_packed_dl_9960[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04013B60, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5964,8 +5964,8 @@ Gfx d_course_luigi_raceway_packed_dl_99D8[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x04013BA0, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 1, 0, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
@@ -5976,8 +5976,8 @@ Gfx d_course_luigi_raceway_packed_dl_99D8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04013C00, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5985,8 +5985,8 @@ Gfx d_course_luigi_raceway_packed_dl_9A60[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x04013C80, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 1, 0, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
@@ -5997,8 +5997,8 @@ Gfx d_course_luigi_raceway_packed_dl_9A60[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04013CE0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6006,8 +6006,8 @@ Gfx d_course_luigi_raceway_packed_dl_9AE8[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x04013D60, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
@@ -6018,8 +6018,8 @@ Gfx d_course_luigi_raceway_packed_dl_9AE8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04013DC0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6054,9 +6054,9 @@ Gfx d_course_luigi_raceway_packed_dl_9C20[] =
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x04013E40, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 4, 0),
-    gsSP1Quadrangle(5, 6, 3, 0, 0),
+    gsSP2Triangles(5, 6, 3, 0, 5, 3, 0, 0),
     gsSP2Triangles(5, 0, 2, 0, 0, 4, 1, 0),
-    gsSP1Quadrangle(2, 1, 7, 8, 0),
+    gsSP2Triangles(2, 1, 7, 0, 2, 7, 8, 0),
     gsSP2Triangles(1, 4, 9, 0, 1, 10, 7, 0),
     gsSP2Triangles(1, 11, 10, 0, 1, 9, 11, 0),
     gsSP2Triangles(5, 2, 8, 0, 12, 13, 14, 0),
@@ -6065,24 +6065,24 @@ Gfx d_course_luigi_raceway_packed_dl_9C20[] =
     gsSP2Triangles(18, 13, 12, 0, 15, 20, 16, 0),
     gsSP2Triangles(15, 16, 12, 0, 21, 22, 14, 0),
     gsSP2Triangles(21, 14, 13, 0, 15, 14, 23, 0),
-    gsSP1Quadrangle(15, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 20, 15, 25, 0),
-    gsSP1Quadrangle(16, 21, 27, 17, 0),
-    gsSP1Quadrangle(20, 22, 21, 16, 0),
-    gsSP1Quadrangle(27, 21, 13, 19, 0),
-    gsSP1Quadrangle(17, 27, 28, 29, 0),
+    gsSP2Triangles(15, 23, 24, 0, 15, 24, 25, 0),
+    gsSP2Triangles(26, 20, 15, 0, 26, 15, 25, 0),
+    gsSP2Triangles(16, 21, 27, 0, 16, 27, 17, 0),
+    gsSP2Triangles(20, 22, 21, 0, 20, 21, 16, 0),
+    gsSP2Triangles(27, 21, 13, 0, 27, 13, 19, 0),
+    gsSP2Triangles(17, 27, 28, 0, 17, 28, 29, 0),
     gsSP2Triangles(29, 17, 30, 0, 30, 17, 27, 0),
-    gsSP1Quadrangle(18, 17, 29, 31, 0),
+    gsSP2Triangles(18, 17, 29, 0, 18, 29, 31, 0),
     gsSPVertex(0x04014040, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(5, 8, 9, 6, 0),
-    gsSP1Quadrangle(10, 5, 4, 11, 0),
-    gsSP1Quadrangle(12, 8, 5, 10, 0),
-    gsSP1Quadrangle(13, 14, 0, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(5, 8, 9, 0, 5, 9, 6, 0),
+    gsSP2Triangles(10, 5, 4, 0, 10, 4, 11, 0),
+    gsSP2Triangles(12, 8, 5, 0, 12, 5, 10, 0),
+    gsSP2Triangles(13, 14, 0, 0, 13, 0, 15, 0),
     gsSP2Triangles(1, 0, 14, 0, 16, 1, 14, 0),
-    gsSP1Quadrangle(17, 18, 2, 1, 0),
-    gsSP1Quadrangle(19, 17, 1, 20, 0),
+    gsSP2Triangles(17, 18, 2, 0, 17, 2, 1, 0),
+    gsSP2Triangles(19, 17, 1, 0, 19, 1, 20, 0),
     gsSP2Triangles(20, 1, 16, 0, 21, 22, 18, 0),
     gsSP2Triangles(22, 21, 23, 0, 15, 22, 24, 0),
     gsSP2Triangles(24, 22, 23, 0, 15, 17, 13, 0),
@@ -6091,18 +6091,18 @@ Gfx d_course_luigi_raceway_packed_dl_9C20[] =
     gsSP2Triangles(17, 28, 13, 0, 29, 9, 8, 0),
     gsSP2Triangles(29, 8, 30, 0, 31, 9, 29, 0),
     gsSPVertex(0x04014240, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 0, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 0, 0, 4, 0, 3, 0),
     gsSP2Triangles(6, 7, 8, 0, 9, 7, 6, 0),
     gsSP2Triangles(7, 10, 8, 0, 11, 12, 13, 0),
     gsSP2Triangles(11, 13, 14, 0, 13, 15, 16, 0),
     gsSP2Triangles(13, 16, 17, 0, 14, 13, 17, 0),
     gsSP2Triangles(14, 17, 18, 0, 2, 8, 10, 0),
     gsSP2Triangles(2, 10, 3, 0, 19, 20, 21, 0),
-    gsSP1Quadrangle(20, 22, 23, 24, 0),
+    gsSP2Triangles(20, 22, 23, 0, 20, 23, 24, 0),
     gsSP2Triangles(20, 24, 21, 0, 25, 5, 26, 0),
-    gsSP1Quadrangle(27, 28, 25, 29, 0),
-    gsSP1Quadrangle(30, 4, 5, 31, 0),
+    gsSP2Triangles(27, 28, 25, 0, 27, 25, 29, 0),
+    gsSP2Triangles(30, 4, 5, 0, 30, 5, 31, 0),
     gsSP1Triangle(26, 5, 4, 0),
     gsSPVertex(0x04014440, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
@@ -6119,21 +6119,21 @@ Gfx d_course_luigi_raceway_packed_dl_9C20[] =
     gsSP2Triangles(28, 29, 30, 0, 31, 24, 27, 0),
     gsSP1Triangle(31, 27, 28, 0),
     gsSPVertex(0x04014640, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 5, 4, 0),
-    gsSP1Quadrangle(10, 11, 9, 8, 0),
-    gsSP1Quadrangle(12, 13, 11, 10, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(14, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 15, 19, 0),
-    gsSP1Quadrangle(22, 20, 19, 18, 0),
-    gsSP1Quadrangle(23, 24, 21, 25, 0),
-    gsSP1Quadrangle(23, 25, 20, 22, 0),
-    gsSP1Quadrangle(26, 12, 10, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 5, 0, 8, 5, 4, 0),
+    gsSP2Triangles(10, 11, 9, 0, 10, 9, 8, 0),
+    gsSP2Triangles(12, 13, 11, 0, 12, 11, 10, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(14, 17, 18, 0, 14, 18, 19, 0),
+    gsSP2Triangles(20, 21, 15, 0, 20, 15, 19, 0),
+    gsSP2Triangles(22, 20, 19, 0, 22, 19, 18, 0),
+    gsSP2Triangles(23, 24, 21, 0, 23, 21, 25, 0),
+    gsSP2Triangles(23, 25, 20, 0, 23, 20, 22, 0),
+    gsSP2Triangles(26, 12, 10, 0, 26, 10, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04014840, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6155,14 +6155,14 @@ Gfx d_course_luigi_raceway_packed_dl_9ED0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04014880, 19, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(0, 3, 4, 0, 0, 5, 6, 0),
-    gsSP1Quadrangle(0, 6, 7, 8, 0),
-    gsSP1Quadrangle(0, 8, 9, 10, 0),
-    gsSP1Quadrangle(0, 10, 11, 12, 0),
-    gsSP1Quadrangle(0, 12, 13, 14, 0),
-    gsSP1Quadrangle(0, 14, 15, 16, 0),
-    gsSP1Quadrangle(0, 16, 17, 18, 0),
+    gsSP2Triangles(0, 6, 7, 0, 0, 7, 8, 0),
+    gsSP2Triangles(0, 8, 9, 0, 0, 9, 10, 0),
+    gsSP2Triangles(0, 10, 11, 0, 0, 11, 12, 0),
+    gsSP2Triangles(0, 12, 13, 0, 0, 13, 14, 0),
+    gsSP2Triangles(0, 14, 15, 0, 0, 15, 16, 0),
+    gsSP2Triangles(0, 16, 17, 0, 0, 17, 18, 0),
     gsSP1Triangle(0, 18, 1, 0),
     gsSPEndDisplayList(),
 };
@@ -6179,15 +6179,15 @@ Gfx d_course_luigi_raceway_packed_dl_9F70[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040149B0, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(0, 3, 4, 5, 0),
-    gsSP1Quadrangle(0, 6, 7, 8, 0),
-    gsSP1Quadrangle(0, 8, 9, 10, 0),
-    gsSP1Quadrangle(0, 10, 11, 12, 0),
-    gsSP1Quadrangle(0, 12, 13, 14, 0),
-    gsSP1Quadrangle(0, 14, 15, 16, 0),
-    gsSP1Quadrangle(0, 16, 17, 18, 0),
-    gsSP1Quadrangle(0, 18, 19, 1, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0),
+    gsSP2Triangles(0, 6, 7, 0, 0, 7, 8, 0),
+    gsSP2Triangles(0, 8, 9, 0, 0, 9, 10, 0),
+    gsSP2Triangles(0, 10, 11, 0, 0, 11, 12, 0),
+    gsSP2Triangles(0, 12, 13, 0, 0, 13, 14, 0),
+    gsSP2Triangles(0, 14, 15, 0, 0, 15, 16, 0),
+    gsSP2Triangles(0, 16, 17, 0, 0, 17, 18, 0),
+    gsSP2Triangles(0, 18, 19, 0, 0, 19, 1, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6210,7 +6210,7 @@ Gfx d_course_luigi_raceway_packed_dl_A028[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04014AF0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6226,8 +6226,8 @@ Gfx d_course_luigi_raceway_packed_dl_A088[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04014B30, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 1, 0, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6243,7 +6243,7 @@ Gfx d_course_luigi_raceway_packed_dl_A0F0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04014B90, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6259,7 +6259,7 @@ Gfx d_course_luigi_raceway_packed_dl_A150[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04014BD0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6275,7 +6275,7 @@ Gfx d_course_luigi_raceway_packed_dl_A1B0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04014C10, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6291,7 +6291,7 @@ Gfx d_course_luigi_raceway_packed_dl_A210[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04014C50, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6350,7 +6350,7 @@ Gfx d_course_luigi_raceway_packed_dl_A368[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04014CF0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6366,8 +6366,8 @@ Gfx d_course_luigi_raceway_packed_dl_A3C8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04014D30, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6383,7 +6383,7 @@ Gfx d_course_luigi_raceway_packed_dl_A430[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04014DB0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6416,7 +6416,7 @@ Gfx d_course_luigi_raceway_packed_dl_A4F8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04014E80, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6432,8 +6432,8 @@ Gfx d_course_luigi_raceway_packed_dl_A558[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04014EC0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6449,7 +6449,7 @@ Gfx d_course_luigi_raceway_packed_dl_A5C0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04014F40, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6465,8 +6465,8 @@ Gfx d_course_luigi_raceway_packed_dl_A620[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04014F80, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6482,7 +6482,7 @@ Gfx d_course_luigi_raceway_packed_dl_A688[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04014FE0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6498,7 +6498,7 @@ Gfx d_course_luigi_raceway_packed_dl_A6E8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04015020, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6514,7 +6514,7 @@ Gfx d_course_luigi_raceway_packed_dl_A748[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04015060, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6530,7 +6530,7 @@ Gfx d_course_luigi_raceway_packed_dl_A7A8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040150A0, 10, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
     gsSPEndDisplayList(),
 };
@@ -6579,7 +6579,7 @@ Gfx d_course_luigi_raceway_packed_dl_A8D0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040151A0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6595,8 +6595,8 @@ Gfx d_course_luigi_raceway_packed_dl_A930[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040151E0, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(0, 4, 5, 1, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(0, 4, 5, 0, 0, 5, 1, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6612,8 +6612,8 @@ Gfx d_course_luigi_raceway_packed_dl_A998[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04015240, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6629,8 +6629,8 @@ Gfx d_course_luigi_raceway_packed_dl_AA00[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040152C0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6646,8 +6646,8 @@ Gfx d_course_luigi_raceway_packed_dl_AA68[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04015340, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6663,8 +6663,8 @@ Gfx d_course_luigi_raceway_packed_dl_AAD0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040153C0, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(0, 3, 4, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6680,8 +6680,8 @@ Gfx d_course_luigi_raceway_packed_dl_AB38[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04015420, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6697,8 +6697,8 @@ Gfx d_course_luigi_raceway_packed_dl_ABA0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040154A0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6714,8 +6714,8 @@ Gfx d_course_luigi_raceway_packed_dl_AC08[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04015520, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6731,8 +6731,8 @@ Gfx d_course_luigi_raceway_packed_dl_AC70[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040155A0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6765,8 +6765,8 @@ Gfx d_course_luigi_raceway_packed_dl_AD40[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040156E0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6782,8 +6782,8 @@ Gfx d_course_luigi_raceway_packed_dl_ADA8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04015760, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6799,8 +6799,8 @@ Gfx d_course_luigi_raceway_packed_dl_AE10[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040157E0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6816,8 +6816,8 @@ Gfx d_course_luigi_raceway_packed_dl_AE78[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04015860, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6833,8 +6833,8 @@ Gfx d_course_luigi_raceway_packed_dl_AEE0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040158E0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6850,8 +6850,8 @@ Gfx d_course_luigi_raceway_packed_dl_AF48[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04015960, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6867,7 +6867,7 @@ Gfx d_course_luigi_raceway_packed_dl_AFB0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040159E0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6940,8 +6940,8 @@ Gfx d_course_luigi_raceway_packed_dl_B198[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04015AB0, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(0, 3, 4, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6957,8 +6957,8 @@ Gfx d_course_luigi_raceway_packed_dl_B200[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04015B10, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(0, 3, 4, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6974,8 +6974,8 @@ Gfx d_course_luigi_raceway_packed_dl_B268[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04015B70, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(0, 3, 4, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6991,8 +6991,8 @@ Gfx d_course_luigi_raceway_packed_dl_B2D0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04015BD0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7008,8 +7008,8 @@ Gfx d_course_luigi_raceway_packed_dl_B338[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04015C50, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7025,8 +7025,8 @@ Gfx d_course_luigi_raceway_packed_dl_B3A0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04015CD0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7042,8 +7042,8 @@ Gfx d_course_luigi_raceway_packed_dl_B408[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04015D50, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(0, 3, 4, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7059,7 +7059,7 @@ Gfx d_course_luigi_raceway_packed_dl_B470[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04015DB0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7075,7 +7075,7 @@ Gfx d_course_luigi_raceway_packed_dl_B4D0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04015DF0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7091,7 +7091,7 @@ Gfx d_course_luigi_raceway_packed_dl_B530[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04015E30, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7107,7 +7107,7 @@ Gfx d_course_luigi_raceway_packed_dl_B590[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04015E70, 10, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(0, 3, 4, 0, 2, 5, 6, 0),
     gsSP2Triangles(2, 6, 3, 0, 7, 8, 9, 0),
     gsSPEndDisplayList(),
@@ -7144,7 +7144,7 @@ Gfx d_course_luigi_raceway_packed_dl_B678[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04016000, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7160,8 +7160,8 @@ Gfx d_course_luigi_raceway_packed_dl_B6D8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04016040, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7177,8 +7177,8 @@ Gfx d_course_luigi_raceway_packed_dl_B740[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040160C0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7194,8 +7194,8 @@ Gfx d_course_luigi_raceway_packed_dl_B7A8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04016140, 7, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 1, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 1, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7211,8 +7211,8 @@ Gfx d_course_luigi_raceway_packed_dl_B810[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040161B0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7228,8 +7228,8 @@ Gfx d_course_luigi_raceway_packed_dl_B878[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04016230, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7245,8 +7245,8 @@ Gfx d_course_luigi_raceway_packed_dl_B8E0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040162B0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7262,8 +7262,8 @@ Gfx d_course_luigi_raceway_packed_dl_B948[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04016330, 9, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(0, 3, 4, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0),
     gsSP1Triangle(6, 7, 8, 0),
     gsSPEndDisplayList(),
 };
@@ -7280,8 +7280,8 @@ Gfx d_course_luigi_raceway_packed_dl_B9B8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040163C0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7297,7 +7297,7 @@ Gfx d_course_luigi_raceway_packed_dl_BA20[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04016440, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7313,9 +7313,9 @@ Gfx d_course_luigi_raceway_packed_dl_BA80[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04016480, 10, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(0, 3, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7365,7 +7365,7 @@ Gfx d_course_luigi_raceway_packed_dl_BBC0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04016630, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7381,8 +7381,8 @@ Gfx d_course_luigi_raceway_packed_dl_BC20[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04016670, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7478,7 +7478,7 @@ Gfx d_course_luigi_raceway_packed_dl_BE88[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040167A0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05003800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
@@ -7524,7 +7524,7 @@ Gfx d_course_luigi_raceway_packed_dl_BFB8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040168A0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05003800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
@@ -7573,7 +7573,7 @@ Gfx d_course_luigi_raceway_packed_dl_C0F0[] =
     gsSPVertex(0x040169E0, 9, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 4, 6, 0),
-    gsSP1Quadrangle(8, 7, 6, 2, 0),
+    gsSP2Triangles(8, 7, 6, 0, 8, 6, 2, 0),
     gsSP1Triangle(8, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05003800),
     gsDPTileSync(),
@@ -7581,7 +7581,7 @@ Gfx d_course_luigi_raceway_packed_dl_C0F0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04016A70, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7597,7 +7597,7 @@ Gfx d_course_luigi_raceway_packed_dl_C1A0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04016AB0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7613,7 +7613,7 @@ Gfx d_course_luigi_raceway_packed_dl_C200[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04016AF0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7629,7 +7629,7 @@ Gfx d_course_luigi_raceway_packed_dl_C260[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04016B30, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05003800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
@@ -7695,17 +7695,17 @@ Gfx d_course_luigi_raceway_packed_dl_C410[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04016CC0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04016EC0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7721,11 +7721,11 @@ Gfx d_course_luigi_raceway_packed_dl_C4C0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04016F40, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7741,11 +7741,11 @@ Gfx d_course_luigi_raceway_packed_dl_C540[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04017080, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -7761,11 +7761,11 @@ Gfx d_course_luigi_raceway_packed_dl_C5C0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040171C0, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
diff --git a/courses/mushroom_cup/moo_moo_farm/course_data.inc.c b/courses/mushroom_cup/moo_moo_farm/course_data.inc.c
index 5c8172e63..395180723 100644
--- a/courses/mushroom_cup/moo_moo_farm/course_data.inc.c
+++ b/courses/mushroom_cup/moo_moo_farm/course_data.inc.c
@@ -8581,9 +8581,9 @@ Gfx d_course_moo_moo_farm_dl_cow1[] =
     gsSPDisplayList(d_course_moo_moo_farm_dl_13B88),
     gsDPLoadTextureBlock(0x0300A000, G_IM_FMT_CI, G_IM_SIZ_8b, 32, 64, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD),
     gsSPVertex(d_course_moo_moo_farm_cow_model, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPLoadTextureBlock(0x0300A800, G_IM_FMT_CI, G_IM_SIZ_8b, 32, 64, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPEndDisplayList(),
 };
@@ -8597,13 +8597,13 @@ Gfx d_course_moo_moo_farm_dl_cow2[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 512),
     gsSPVertex(d_course_moo_moo_farm_unknown_model1, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_CI, G_IM_SIZ_8b, 1, 0x0300B800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_CI, G_IM_SIZ_8b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 512),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPEndDisplayList(),
 };
@@ -8617,13 +8617,13 @@ Gfx d_course_moo_moo_farm_dl_cow3[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 512),
     gsSPVertex(d_course_moo_moo_farm_unknown_model2, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_CI, G_IM_SIZ_8b, 1, 0x0300C800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_CI, G_IM_SIZ_8b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 512),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPEndDisplayList(),
 };
@@ -8637,13 +8637,13 @@ Gfx d_course_moo_moo_farm_dl_cow4[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 512),
     gsSPVertex(d_course_moo_moo_farm_unknown_model2, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_CI, G_IM_SIZ_8b, 1, 0x0300D800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_CI, G_IM_SIZ_8b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 512),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPEndDisplayList(),
 };
@@ -8657,13 +8657,13 @@ Gfx d_course_moo_moo_farm_dl_cow5[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 512),
     gsSPVertex(d_course_moo_moo_farm_unknown_model1, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_CI, G_IM_SIZ_8b, 1, 0x0300E800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_CI, G_IM_SIZ_8b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 512),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPEndDisplayList(),
 };
@@ -8692,9 +8692,9 @@ Gfx d_course_moo_moo_farm_dl_tree[] =
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x00FC),
     gsDPLoadTextureBlock(0x03009000, G_IM_FMT_CI, G_IM_SIZ_8b, 32, 64, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD),
     gsSPVertex(d_course_moo_moo_farm_tree_model, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPLoadTextureBlock(0x03009800, G_IM_FMT_CI, G_IM_SIZ_8b, 32, 64, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPEndDisplayList(),
 };
diff --git a/courses/mushroom_cup/moo_moo_farm/packed.inc.c b/courses/mushroom_cup/moo_moo_farm/packed.inc.c
index cde1e5b38..d5ab86151 100644
--- a/courses/mushroom_cup/moo_moo_farm/packed.inc.c
+++ b/courses/mushroom_cup/moo_moo_farm/packed.inc.c
@@ -9,8 +9,8 @@ Gfx d_course_moo_moo_farm_packed_dl_0[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04000000, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -18,8 +18,8 @@ Gfx d_course_moo_moo_farm_packed_dl_28[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04000080, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 9, 11, 10, 0),
     gsSPEndDisplayList(),
 };
@@ -28,8 +28,8 @@ Gfx d_course_moo_moo_farm_packed_dl_58[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04000140, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 9, 11, 10, 0),
     gsSPEndDisplayList(),
 };
@@ -71,11 +71,11 @@ Gfx d_course_moo_moo_farm_packed_dl_130[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04000500, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 9, 11, 10, 0),
     gsSP2Triangles(12, 13, 14, 0, 12, 15, 13, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -96,7 +96,7 @@ Gfx d_course_moo_moo_farm_packed_dl_1A0[] =
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
     gsSP2Triangles(4, 5, 6, 0, 4, 7, 5, 0),
     gsSP2Triangles(8, 9, 10, 0, 8, 11, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 17, 19, 18, 0),
     gsSPEndDisplayList(),
 };
@@ -108,7 +108,7 @@ Gfx d_course_moo_moo_farm_packed_dl_1E0[] =
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
     gsSP2Triangles(4, 5, 6, 0, 4, 7, 5, 0),
     gsSP2Triangles(8, 9, 10, 0, 8, 11, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 16, 19, 17, 0),
     gsSPEndDisplayList(),
 };
@@ -120,7 +120,7 @@ Gfx d_course_moo_moo_farm_packed_dl_220[] =
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
     gsSP2Triangles(4, 5, 6, 0, 4, 7, 5, 0),
     gsSP2Triangles(8, 9, 10, 0, 9, 11, 10, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -130,8 +130,8 @@ Gfx d_course_moo_moo_farm_packed_dl_258[] =
     gsSPVertex(0x04000A80, 16, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
     gsSP2Triangles(4, 5, 6, 0, 4, 7, 5, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -149,8 +149,8 @@ Gfx d_course_moo_moo_farm_packed_dl_2B0[] =
     gsSPVertex(0x04000BC0, 16, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
     gsSP2Triangles(4, 5, 6, 0, 4, 7, 5, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -169,9 +169,9 @@ Gfx d_course_moo_moo_farm_packed_dl_318[] =
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04000D80, 16, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 0, 2, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -179,10 +179,10 @@ Gfx d_course_moo_moo_farm_packed_dl_350[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04000E80, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -193,7 +193,7 @@ Gfx d_course_moo_moo_farm_packed_dl_388[] =
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
     gsSP2Triangles(4, 5, 6, 0, 4, 7, 5, 0),
     gsSP2Triangles(8, 9, 10, 0, 8, 11, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 17, 19, 18, 0),
     gsSPEndDisplayList(),
 };
@@ -202,10 +202,10 @@ Gfx d_course_moo_moo_farm_packed_dl_3C8[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x040010C0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -223,10 +223,10 @@ Gfx d_course_moo_moo_farm_packed_dl_430[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04001280, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -234,10 +234,10 @@ Gfx d_course_moo_moo_farm_packed_dl_468[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04001380, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 4, 6, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -349,9 +349,9 @@ Gfx d_course_moo_moo_farm_packed_dl_6E0[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04001B40, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 12, 15, 13, 0),
     gsSP2Triangles(16, 17, 18, 0, 19, 16, 18, 0),
     gsSPEndDisplayList(),
@@ -374,7 +374,7 @@ Gfx d_course_moo_moo_farm_packed_dl_750[] =
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
     gsSP2Triangles(4, 5, 6, 0, 4, 7, 5, 0),
     gsSP2Triangles(8, 9, 10, 0, 8, 11, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 16, 19, 17, 0),
     gsSPEndDisplayList(),
 };
@@ -397,8 +397,8 @@ Gfx d_course_moo_moo_farm_packed_dl_7D0[] =
     gsSPVertex(0x04001FC0, 16, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
     gsSP2Triangles(4, 5, 6, 0, 4, 7, 5, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -408,8 +408,8 @@ Gfx d_course_moo_moo_farm_packed_dl_808[] =
     gsSPVertex(0x040020C0, 16, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
     gsSP2Triangles(4, 5, 6, 0, 4, 7, 5, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -436,10 +436,10 @@ Gfx d_course_moo_moo_farm_packed_dl_898[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04002300, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -448,9 +448,9 @@ Gfx d_course_moo_moo_farm_packed_dl_8D0[] =
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04002400, 16, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 0, 2, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -458,9 +458,9 @@ Gfx d_course_moo_moo_farm_packed_dl_908[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04002500, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 13, 15, 14, 0),
     gsSPEndDisplayList(),
 };
@@ -469,10 +469,10 @@ Gfx d_course_moo_moo_farm_packed_dl_940[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04002600, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -480,8 +480,8 @@ Gfx d_course_moo_moo_farm_packed_dl_978[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04002700, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 9, 11, 10, 0),
     gsSP2Triangles(12, 13, 14, 0, 13, 15, 14, 0),
     gsSPEndDisplayList(),
@@ -501,10 +501,10 @@ Gfx d_course_moo_moo_farm_packed_dl_9E0[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x040028C0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -514,8 +514,8 @@ Gfx d_course_moo_moo_farm_packed_dl_A18[] =
     gsSPVertex(0x040029C0, 16, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 0, 2, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 4, 6, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -569,21 +569,21 @@ Gfx d_course_moo_moo_farm_packed_dl_B40[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04002B80, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04002D80, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -597,19 +597,19 @@ Gfx d_course_moo_moo_farm_packed_dl_C20[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04002F00, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(7, 6, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(7, 6, 8, 0, 7, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPVertex(0x040030E0, 14, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 1, 0, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
     gsSPEndDisplayList(),
 };
 
@@ -631,8 +631,8 @@ Gfx d_course_moo_moo_farm_packed_dl_CB0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x040031C0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 6, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x007C),
@@ -642,14 +642,14 @@ Gfx d_course_moo_moo_farm_packed_dl_CB0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04003240, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05011800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04003280, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -659,8 +659,8 @@ Gfx d_course_moo_moo_farm_packed_dl_CB0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040032C0, 7, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 6, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 6, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 6, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x007C),
@@ -670,8 +670,8 @@ Gfx d_course_moo_moo_farm_packed_dl_CB0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04003330, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -687,8 +687,8 @@ Gfx d_course_moo_moo_farm_packed_dl_E50[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040033B0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -704,8 +704,8 @@ Gfx d_course_moo_moo_farm_packed_dl_EB8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04003430, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -721,8 +721,8 @@ Gfx d_course_moo_moo_farm_packed_dl_F20[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x040034B0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 6, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x007C),
@@ -732,14 +732,14 @@ Gfx d_course_moo_moo_farm_packed_dl_F20[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04003530, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05011800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04003570, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -749,8 +749,8 @@ Gfx d_course_moo_moo_farm_packed_dl_F20[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040035B0, 7, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 6, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 6, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 6, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x007C),
@@ -760,8 +760,8 @@ Gfx d_course_moo_moo_farm_packed_dl_F20[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04003620, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1431,7 +1431,7 @@ Gfx d_course_moo_moo_farm_packed_dl_1FD0[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04009A50, 18, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 1, 5, 0, 6, 7, 8, 0),
     gsSP2Triangles(9, 10, 11, 0, 12, 13, 14, 0),
     gsSP1Triangle(15, 16, 17, 0),
@@ -1443,7 +1443,7 @@ Gfx d_course_moo_moo_farm_packed_dl_2008[] =
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04009B70, 18, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsSP2Triangles(10, 11, 12, 0, 10, 13, 14, 0),
     gsSP1Triangle(15, 16, 17, 0),
     gsSPEndDisplayList(),
@@ -2360,10 +2360,10 @@ Gfx d_course_moo_moo_farm_packed_dl_34B8[] =
     gsSP2Triangles(4, 5, 6, 0, 5, 7, 6, 0),
     gsSP2Triangles(8, 9, 10, 0, 8, 11, 9, 0),
     gsSP2Triangles(12, 13, 14, 0, 13, 15, 14, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSP2Triangles(20, 21, 22, 0, 20, 23, 21, 0),
     gsSP2Triangles(24, 25, 26, 0, 25, 27, 26, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2387,9 +2387,9 @@ Gfx d_course_moo_moo_farm_packed_dl_3590[] =
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0100, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
     gsSPVertex(0x04012320, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 5, 7, 6, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 15, 12, 14, 0),
     gsSP2Triangles(16, 17, 18, 0, 16, 19, 17, 0),
     gsSP2Triangles(20, 21, 22, 0, 20, 23, 21, 0),
@@ -2454,9 +2454,9 @@ Gfx d_course_moo_moo_farm_packed_dl_3748[] =
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
     gsSP2Triangles(4, 5, 6, 0, 5, 7, 6, 0),
     gsSP2Triangles(8, 9, 10, 0, 9, 11, 10, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSP2Triangles(24, 25, 26, 0, 25, 27, 26, 0),
     gsSP2Triangles(28, 29, 30, 0, 28, 31, 29, 0),
     gsSPEndDisplayList(),
@@ -2483,9 +2483,9 @@ Gfx d_course_moo_moo_farm_packed_dl_3828[] =
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0100, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
     gsSPVertex(0x040131C0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 4, 7, 5, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 13, 15, 14, 0),
     gsSP2Triangles(13, 16, 15, 0, 17, 18, 19, 0),
     gsSP2Triangles(20, 17, 19, 0, 21, 22, 23, 0),
@@ -2517,7 +2517,7 @@ Gfx d_course_moo_moo_farm_packed_dl_3918[] =
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0100, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
     gsSPVertex(0x040136D0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 5, 7, 6, 0),
     gsSP2Triangles(8, 9, 10, 0, 9, 11, 10, 0),
     gsSP2Triangles(12, 13, 14, 0, 13, 15, 14, 0),
@@ -2550,11 +2550,11 @@ Gfx d_course_moo_moo_farm_packed_dl_39F8[] =
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
     gsSPVertex(0x04013BA0, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 15, 12, 14, 0),
     gsSP2Triangles(16, 17, 18, 0, 17, 19, 18, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSP2Triangles(24, 25, 26, 0, 25, 27, 26, 0),
     gsSP2Triangles(28, 29, 30, 0, 31, 28, 30, 0),
     gsDPTileSync(),
@@ -2578,7 +2578,7 @@ Gfx d_course_moo_moo_farm_packed_dl_39F8[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04013E20, 8, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2601,12 +2601,12 @@ Gfx d_course_moo_moo_farm_packed_dl_3B88[] =
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0100, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
     gsSPVertex(0x040140C0, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 9, 11, 10, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 17, 19, 18, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2635,9 +2635,9 @@ Gfx d_course_moo_moo_farm_packed_dl_3C48[] =
     gsSPVertex(0x040145D0, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
     gsSP2Triangles(4, 5, 6, 0, 4, 7, 5, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 13, 15, 14, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSP2Triangles(20, 21, 22, 0, 21, 23, 22, 0),
     gsSP2Triangles(24, 25, 26, 0, 24, 27, 25, 0),
     gsSP2Triangles(28, 29, 30, 0, 28, 31, 29, 0),
@@ -2671,7 +2671,7 @@ Gfx d_course_moo_moo_farm_packed_dl_3D50[] =
     gsSPVertex(0x04014BB0, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
     gsSP2Triangles(4, 5, 6, 0, 4, 7, 5, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 13, 15, 14, 0),
     gsSP2Triangles(16, 17, 18, 0, 16, 19, 17, 0),
     gsSP2Triangles(20, 21, 22, 0, 21, 23, 22, 0),
@@ -2709,7 +2709,7 @@ Gfx d_course_moo_moo_farm_packed_dl_3E50[] =
     gsSP2Triangles(8, 9, 10, 0, 9, 11, 10, 0),
     gsSP2Triangles(12, 13, 14, 0, 13, 15, 14, 0),
     gsSP2Triangles(16, 17, 18, 0, 17, 19, 18, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSP2Triangles(24, 25, 26, 0, 25, 27, 26, 0),
     gsSP2Triangles(28, 29, 30, 0, 29, 31, 30, 0),
     gsSPEndDisplayList(),
@@ -2736,10 +2736,10 @@ Gfx d_course_moo_moo_farm_packed_dl_3F30[] =
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0100, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
     gsSPVertex(0x040155F0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 4, 7, 5, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 17, 19, 18, 0),
     gsSP2Triangles(20, 21, 22, 0, 21, 23, 22, 0),
     gsSP2Triangles(23, 24, 22, 0, 25, 26, 27, 0),
@@ -2755,14 +2755,14 @@ Gfx d_course_moo_moo_farm_packed_dl_3F30[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04015820, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05004800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04015860, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2793,8 +2793,8 @@ Gfx d_course_moo_moo_farm_packed_dl_40A8[] =
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
     gsSPVertex(0x04015D00, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 13, 15, 14, 0),
     gsSP2Triangles(16, 17, 18, 0, 19, 16, 18, 0),
     gsSP2Triangles(20, 21, 22, 0, 23, 20, 22, 0),
@@ -2829,14 +2829,14 @@ Gfx d_course_moo_moo_farm_packed_dl_41B0[] =
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0100, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
     gsSPVertex(0x04016340, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 4, 7, 5, 0),
     gsSP2Triangles(8, 9, 10, 0, 9, 11, 10, 0),
     gsSP2Triangles(12, 13, 14, 0, 12, 15, 13, 0),
     gsSP2Triangles(16, 17, 18, 0, 16, 19, 17, 0),
     gsSP2Triangles(20, 21, 22, 0, 20, 23, 21, 0),
     gsSP2Triangles(24, 25, 26, 0, 24, 27, 25, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2849,7 +2849,7 @@ Gfx d_course_moo_moo_farm_packed_dl_42B8[] =
     gsSPVertex(0x04016540, 30, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(6, 7, 8, 0, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 19, 20, 21, 0),
     gsSP2Triangles(22, 23, 24, 0, 25, 26, 5, 0),
     gsSP1Triangle(27, 28, 29, 0),
@@ -2864,9 +2864,9 @@ Gfx d_course_moo_moo_farm_packed_dl_42B8[] =
     gsSPVertex(0x04016890, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 6, 5, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSP2Triangles(20, 21, 22, 0, 21, 23, 22, 0),
     gsSP2Triangles(24, 25, 26, 0, 24, 27, 25, 0),
     gsSP2Triangles(28, 29, 30, 0, 28, 31, 29, 0),
@@ -2895,13 +2895,13 @@ Gfx d_course_moo_moo_farm_packed_dl_43A0[] =
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
     gsSPVertex(0x04016D60, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 17, 19, 18, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSP2Triangles(24, 25, 26, 0, 25, 27, 26, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2928,26 +2928,26 @@ Gfx d_course_moo_moo_farm_packed_dl_4480[] =
     gsSP2Triangles(23, 25, 26, 0, 27, 28, 29, 0),
     gsSP1Triangle(27, 29, 30, 0),
     gsSPVertex(0x04017350, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0100, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
     gsSPVertex(0x04017390, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
     gsSP2Triangles(4, 5, 6, 0, 4, 7, 5, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 15, 12, 14, 0),
     gsSP2Triangles(16, 17, 18, 0, 17, 19, 18, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 25, 24, 29, 0),
-    gsSP1Quadrangle(30, 31, 27, 26, 0),
-    gsSP1Quadrangle(30, 28, 29, 31, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 25, 24, 0, 28, 24, 29, 0),
+    gsSP2Triangles(30, 31, 27, 0, 30, 27, 26, 0),
+    gsSP2Triangles(30, 28, 29, 0, 30, 29, 31, 0),
     gsSPVertex(0x04017590, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(0, 3, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 5, 4, 0),
-    gsSP1Quadrangle(1, 7, 6, 2, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0),
+    gsSP2Triangles(6, 7, 5, 0, 6, 5, 4, 0),
+    gsSP2Triangles(1, 7, 6, 0, 1, 6, 2, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2965,7 +2965,7 @@ Gfx d_course_moo_moo_farm_packed_dl_45D0[] =
     gsSP2Triangles(24, 19, 25, 0, 26, 27, 11, 0),
     gsSP2Triangles(11, 28, 29, 0, 11, 30, 31, 0),
     gsSPVertex(0x04017810, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(10, 11, 12, 0, 13, 14, 5, 0),
     gsSP2Triangles(15, 16, 17, 0, 18, 19, 20, 0),
@@ -2977,13 +2977,13 @@ Gfx d_course_moo_moo_farm_packed_dl_45D0[] =
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0100, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
     gsSPVertex(0x04017A30, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 8, 11, 9, 0),
     gsSP2Triangles(12, 13, 14, 0, 13, 15, 14, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSP2Triangles(28, 29, 30, 0, 28, 31, 29, 0),
     gsSPVertex(0x04017C30, 4, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
@@ -3013,11 +3013,11 @@ Gfx d_course_moo_moo_farm_packed_dl_46E8[] =
     gsSPVertex(0x04017F60, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
     gsSP2Triangles(4, 5, 6, 0, 4, 7, 5, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 15, 12, 14, 0),
     gsSP2Triangles(16, 17, 18, 0, 17, 19, 18, 0),
     gsSP2Triangles(20, 21, 22, 0, 23, 20, 22, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSP2Triangles(28, 29, 30, 0, 29, 31, 30, 0),
     gsSPEndDisplayList(),
 };
@@ -3044,15 +3044,15 @@ Gfx d_course_moo_moo_farm_packed_dl_47C8[] =
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
     gsSPVertex(0x04018450, 30, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(6, 8, 7, 0, 9, 10, 11, 0),
     gsSP2Triangles(9, 11, 12, 0, 13, 14, 15, 0),
     gsSP2Triangles(13, 16, 14, 0, 17, 18, 19, 0),
     gsSP2Triangles(17, 20, 18, 0, 18, 21, 19, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPVertex(0x04018630, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3078,10 +3078,10 @@ Gfx d_course_moo_moo_farm_packed_dl_48B8[] =
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
     gsSPVertex(0x04018950, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 8, 11, 9, 0),
     gsSP2Triangles(12, 13, 14, 0, 13, 15, 14, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSP2Triangles(20, 21, 22, 0, 21, 23, 22, 0),
     gsSP2Triangles(23, 24, 22, 0, 25, 26, 27, 0),
     gsSP2Triangles(26, 28, 27, 0, 29, 30, 31, 0),
@@ -3113,9 +3113,9 @@ Gfx d_course_moo_moo_farm_packed_dl_49A8[] =
     gsSPVertex(0x04018E60, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
     gsSP2Triangles(4, 5, 6, 0, 4, 7, 5, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 13, 15, 14, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSP2Triangles(20, 21, 22, 0, 20, 23, 21, 0),
     gsSP2Triangles(24, 25, 26, 0, 25, 27, 26, 0),
     gsSP2Triangles(28, 29, 30, 0, 29, 31, 30, 0),
@@ -3151,7 +3151,7 @@ Gfx d_course_moo_moo_farm_packed_dl_4A88[] =
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
     gsSP2Triangles(4, 5, 6, 0, 5, 7, 6, 0),
     gsSP2Triangles(8, 9, 10, 0, 8, 11, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 19, 20, 21, 0),
     gsSP2Triangles(19, 21, 22, 0, 23, 24, 25, 0),
     gsSP2Triangles(23, 26, 24, 0, 27, 28, 29, 0),
@@ -3217,8 +3217,8 @@ Gfx d_course_moo_moo_farm_packed_dl_4CB8[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04019700, 12, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3277,23 +3277,23 @@ Gfx d_course_moo_moo_farm_packed_dl_4E20[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040198C0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04019AC0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3309,30 +3309,30 @@ Gfx d_course_moo_moo_farm_packed_dl_4F00[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04019CC0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 0, 4, 5, 0),
-    gsSP1Quadrangle(0, 3, 6, 4, 0),
-    gsSP1Quadrangle(4, 6, 7, 5, 0),
-    gsSP1Quadrangle(8, 9, 10, 5, 0),
-    gsSP1Quadrangle(11, 8, 5, 7, 0),
-    gsSP1Quadrangle(6, 3, 2, 7, 0),
-    gsSP1Quadrangle(12, 11, 7, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(16, 15, 18, 19, 0),
-    gsSP1Quadrangle(15, 14, 20, 18, 0),
-    gsSP1Quadrangle(18, 20, 21, 19, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
-    gsSP1Quadrangle(27, 26, 30, 17, 0),
-    gsSP1Quadrangle(20, 14, 17, 21, 0),
-    gsSP1Quadrangle(12, 9, 8, 11, 0),
-    gsSP1Quadrangle(10, 9, 12, 13, 0),
-    gsSP1Quadrangle(26, 29, 31, 30, 0),
-    gsSP1Quadrangle(30, 31, 21, 17, 0),
-    gsSP1Quadrangle(31, 29, 28, 21, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 0, 4, 0, 1, 4, 5, 0),
+    gsSP2Triangles(0, 3, 6, 0, 0, 6, 4, 0),
+    gsSP2Triangles(4, 6, 7, 0, 4, 7, 5, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 5, 0),
+    gsSP2Triangles(11, 8, 5, 0, 11, 5, 7, 0),
+    gsSP2Triangles(6, 3, 2, 0, 6, 2, 7, 0),
+    gsSP2Triangles(12, 11, 7, 0, 12, 7, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(16, 15, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(15, 14, 20, 0, 15, 20, 18, 0),
+    gsSP2Triangles(18, 20, 21, 0, 18, 21, 19, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
+    gsSP2Triangles(27, 26, 30, 0, 27, 30, 17, 0),
+    gsSP2Triangles(20, 14, 17, 0, 20, 17, 21, 0),
+    gsSP2Triangles(12, 9, 8, 0, 12, 8, 11, 0),
+    gsSP2Triangles(10, 9, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(26, 29, 31, 0, 26, 31, 30, 0),
+    gsSP2Triangles(30, 31, 21, 0, 30, 21, 17, 0),
+    gsSP2Triangles(31, 29, 28, 0, 31, 28, 21, 0),
     gsSPVertex(0x04019EC0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3355,15 +3355,15 @@ Gfx d_course_moo_moo_farm_packed_dl_5030[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04019F40, 28, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 0, 3, 0, 5, 6, 7, 0),
     gsSP2Triangles(5, 8, 9, 0, 5, 7, 8, 0),
     gsSP2Triangles(10, 11, 12, 0, 13, 14, 11, 0),
     gsSP2Triangles(15, 16, 17, 0, 16, 18, 19, 0),
     gsSP2Triangles(20, 21, 22, 0, 21, 23, 24, 0),
     gsSP2Triangles(21, 24, 22, 0, 21, 25, 23, 0),
-    gsSP1Quadrangle(25, 26, 26, 23, 0),
-    gsSP1Quadrangle(20, 22, 27, 27, 0),
+    gsSP2Triangles(25, 26, 26, 0, 25, 26, 23, 0),
+    gsSP2Triangles(20, 22, 27, 0, 20, 27, 27, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3382,12 +3382,12 @@ Gfx d_course_moo_moo_farm_packed_dl_50D0[] =
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
     gsSP2Triangles(0, 4, 3, 0, 5, 6, 7, 0),
     gsSP2Triangles(5, 7, 8, 0, 9, 5, 8, 0),
-    gsSP1Quadrangle(10, 11, 12, 12, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 12, 0),
     gsSP2Triangles(10, 13, 11, 0, 13, 14, 15, 0),
     gsSP2Triangles(13, 16, 11, 0, 13, 15, 16, 0),
     gsSP2Triangles(17, 18, 19, 0, 18, 20, 21, 0),
     gsSP2Triangles(22, 23, 24, 0, 25, 24, 26, 0),
-    gsSP1Quadrangle(14, 27, 27, 15, 0),
+    gsSP2Triangles(14, 27, 27, 0, 14, 27, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3403,14 +3403,14 @@ Gfx d_course_moo_moo_farm_packed_dl_5170[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401A2C0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3426,12 +3426,12 @@ Gfx d_course_moo_moo_farm_packed_dl_5208[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401A4C0, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3456,10 +3456,10 @@ Gfx d_course_moo_moo_farm_packed_dl_52B8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401A640, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 6, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x00FC),
@@ -3469,14 +3469,14 @@ Gfx d_course_moo_moo_farm_packed_dl_52B8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x0401A740, 22, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(7, 10, 11, 8, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(13, 16, 17, 14, 0),
-    gsSP1Quadrangle(17, 18, 19, 14, 0),
-    gsSP1Quadrangle(14, 19, 20, 21, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(7, 10, 11, 0, 7, 11, 8, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(13, 16, 17, 0, 13, 17, 14, 0),
+    gsSP2Triangles(17, 18, 19, 0, 17, 19, 14, 0),
+    gsSP2Triangles(14, 19, 20, 0, 14, 20, 21, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 6, G_TX_NOLOD, G_TX_MIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x00FC),
@@ -3486,8 +3486,8 @@ Gfx d_course_moo_moo_farm_packed_dl_52B8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x0401A8A0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3509,10 +3509,10 @@ Gfx d_course_moo_moo_farm_packed_dl_5420[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401A920, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3528,14 +3528,14 @@ Gfx d_course_moo_moo_farm_packed_dl_5498[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0401AA20, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05009000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0401AA60, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3551,14 +3551,14 @@ Gfx d_course_moo_moo_farm_packed_dl_5530[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0401AAA0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05007000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0401AAE0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3574,10 +3574,10 @@ Gfx d_course_moo_moo_farm_packed_dl_55C8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401AB20, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3658,7 +3658,7 @@ Gfx d_course_moo_moo_farm_packed_dl_57A0[] =
     gsSP2Triangles(4, 5, 6, 0, 4, 7, 5, 0),
     gsSP2Triangles(8, 9, 10, 0, 11, 8, 10, 0),
     gsSP2Triangles(12, 13, 14, 0, 14, 13, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3727,7 +3727,7 @@ Gfx d_course_moo_moo_farm_packed_dl_5988[] =
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
     gsSPVertex(0x0401BC20, 23, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 1, 0, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 11, 8, 10, 0),
     gsSP2Triangles(12, 13, 14, 0, 13, 15, 14, 0),
     gsSP2Triangles(16, 17, 18, 0, 16, 19, 17, 0),
@@ -3744,7 +3744,7 @@ Gfx d_course_moo_moo_farm_packed_dl_5A30[] =
     gsSPVertex(0x0401BD90, 17, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(6, 7, 8, 0, 1, 9, 10, 0),
-    gsSP1Quadrangle(11, 12, 13, 14, 0),
+    gsSP2Triangles(11, 12, 13, 0, 11, 13, 14, 0),
     gsSP1Triangle(11, 15, 16, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0100, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD),
@@ -3763,8 +3763,8 @@ Gfx d_course_moo_moo_farm_packed_dl_5A30[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401BFB0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -3775,7 +3775,7 @@ Gfx d_course_moo_moo_farm_packed_dl_5A30[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401C030, 8, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3795,7 +3795,7 @@ Gfx d_course_moo_moo_farm_packed_dl_5B70[] =
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
     gsSPVertex(0x0401C1F0, 12, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 9, 11, 10, 0),
     gsSPEndDisplayList(),
 };
@@ -3903,14 +3903,14 @@ Gfx d_course_moo_moo_farm_packed_dl_5DC0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0401CE00, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05004800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0401CE40, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3963,9 +3963,9 @@ Gfx d_course_moo_moo_farm_packed_dl_5FD8[] =
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0100, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
     gsSPVertex(0x0401D600, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 4, 7, 5, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 13, 15, 14, 0),
     gsSP2Triangles(16, 17, 18, 0, 18, 19, 16, 0),
     gsSPEndDisplayList(),
@@ -4017,7 +4017,7 @@ Gfx d_course_moo_moo_farm_packed_dl_6130[] =
     gsSP2Triangles(0, 1, 2, 0, 3, 0, 2, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(10, 11, 12, 0, 10, 13, 11, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
     gsSP2Triangles(18, 19, 20, 0, 21, 22, 23, 0),
     gsSP1Triangle(23, 22, 24, 0),
     gsSPEndDisplayList(),
@@ -4092,7 +4092,7 @@ Gfx d_course_moo_moo_farm_packed_dl_6358[] =
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0100, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
     gsSPVertex(0x0401E6D0, 27, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 5, 7, 6, 0),
     gsSP2Triangles(8, 9, 10, 0, 10, 9, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 12, 15, 13, 0),
@@ -4121,13 +4121,13 @@ Gfx d_course_moo_moo_farm_packed_dl_6408[] =
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0100, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
     gsSPVertex(0x0401EAA0, 26, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(3, 4, 0, 0, 5, 6, 7, 0),
     gsSP2Triangles(5, 8, 6, 0, 5, 7, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
     gsSP2Triangles(14, 15, 16, 0, 15, 17, 16, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4150,7 +4150,7 @@ Gfx d_course_moo_moo_farm_packed_dl_64D0[] =
     gsSP2Triangles(0, 1, 2, 0, 2, 3, 0, 0),
     gsSP2Triangles(0, 4, 1, 0, 5, 6, 7, 0),
     gsSP2Triangles(5, 7, 8, 0, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 19, 20, 21, 0),
     gsSP2Triangles(21, 20, 22, 0, 23, 22, 20, 0),
     gsSPEndDisplayList(),
diff --git a/courses/special_cup/banshee_boardwalk/course_data.inc.c b/courses/special_cup/banshee_boardwalk/course_data.inc.c
index 2b2679763..a47ed204d 100644
--- a/courses/special_cup/banshee_boardwalk/course_data.inc.c
+++ b/courses/special_cup/banshee_boardwalk/course_data.inc.c
@@ -3697,11 +3697,11 @@ Gfx d_course_banshee_boardwalk_dl_7650[] =
     gsSP2Triangles(4, 1, 5, 0, 4, 2, 1, 0),
     gsSP2Triangles(1, 3, 6, 0, 5, 1, 6, 0),
     gsSP2Triangles(4, 5, 7, 0, 7, 5, 6, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSP2Triangles(11, 10, 12, 0, 12, 10, 9, 0),
     gsSP2Triangles(8, 13, 14, 0, 8, 15, 9, 0),
-    gsSP1Quadrangle(9, 15, 0, 2, 0),
-    gsSP1Quadrangle(16, 17, 12, 18, 0),
+    gsSP2Triangles(9, 15, 0, 0, 9, 0, 2, 0),
+    gsSP2Triangles(16, 17, 12, 0, 16, 12, 18, 0),
     gsSP2Triangles(18, 12, 9, 0, 11, 12, 17, 0),
     gsSP2Triangles(16, 19, 20, 0, 19, 16, 18, 0),
     gsSP2Triangles(16, 21, 17, 0, 20, 21, 16, 0),
@@ -3732,17 +3732,17 @@ Gfx d_course_banshee_boardwalk_dl_7650[] =
     gsSP2Triangles(8, 0, 9, 0, 10, 11, 12, 0),
     gsSP2Triangles(10, 13, 11, 0, 13, 10, 8, 0),
     gsSP2Triangles(14, 10, 12, 0, 15, 16, 11, 0),
-    gsSP1Quadrangle(17, 12, 11, 16, 0),
+    gsSP2Triangles(17, 12, 11, 0, 17, 11, 16, 0),
     gsSP2Triangles(9, 13, 8, 0, 17, 18, 12, 0),
     gsSP2Triangles(14, 12, 18, 0, 13, 9, 19, 0),
     gsSP2Triangles(20, 21, 22, 0, 23, 20, 24, 0),
     gsSP2Triangles(21, 20, 23, 0, 20, 22, 25, 0),
     gsSP2Triangles(24, 20, 25, 0, 21, 26, 22, 0),
-    gsSP1Quadrangle(27, 28, 21, 23, 0),
+    gsSP2Triangles(27, 28, 21, 0, 27, 21, 23, 0),
     gsSP2Triangles(18, 21, 28, 0, 18, 26, 21, 0),
     gsSP2Triangles(17, 26, 18, 0, 14, 18, 28, 0),
     gsSP2Triangles(29, 5, 30, 0, 31, 25, 22, 0),
-    gsSP1Quadrangle(31, 22, 26, 17, 0),
+    gsSP2Triangles(31, 22, 26, 0, 31, 26, 17, 0),
     gsSPVertex(d_course_banshee_boardwalk_cheep_cheep4, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 4, 0),
@@ -3764,9 +3764,9 @@ Gfx d_course_banshee_boardwalk_dl_7650[] =
     gsSP2Triangles(9, 11, 10, 0, 12, 2, 11, 0),
     gsSP2Triangles(12, 0, 2, 0, 13, 14, 12, 0),
     gsSP2Triangles(11, 13, 12, 0, 11, 9, 13, 0),
-    gsSP1Quadrangle(15, 16, 17, 18, 0),
+    gsSP2Triangles(15, 16, 17, 0, 15, 17, 18, 0),
     gsSP2Triangles(15, 18, 19, 0, 18, 20, 19, 0),
-    gsSP1Quadrangle(21, 22, 23, 24, 0),
+    gsSP2Triangles(21, 22, 23, 0, 21, 23, 24, 0),
     gsSP2Triangles(25, 3, 26, 0, 27, 28, 29, 0),
     gsSPEndDisplayList(),
 };
@@ -3790,10 +3790,10 @@ Gfx d_course_banshee_boardwalk_dl_78C0[] =
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 4, 0),
     gsSP2Triangles(2, 1, 4, 0, 3, 5, 4, 0),
     gsSP2Triangles(4, 6, 7, 0, 7, 2, 4, 0),
-    gsSP1Quadrangle(4, 8, 9, 6, 0),
+    gsSP2Triangles(4, 8, 9, 0, 4, 9, 6, 0),
     gsSP2Triangles(4, 10, 8, 0, 0, 2, 11, 0),
     gsSP2Triangles(2, 12, 11, 0, 12, 2, 7, 0),
-    gsSP1Quadrangle(6, 9, 13, 14, 0),
+    gsSP2Triangles(6, 9, 13, 0, 6, 13, 14, 0),
     gsSP2Triangles(15, 6, 14, 0, 15, 7, 6, 0),
     gsSPEndDisplayList(),
 };
@@ -3811,7 +3811,7 @@ Gfx d_course_banshee_boardwalk_dl_7978[] =
     gsSP2Triangles(12, 13, 14, 0, 15, 12, 14, 0),
     gsSP2Triangles(12, 16, 13, 0, 17, 18, 13, 0),
     gsSP2Triangles(13, 18, 14, 0, 16, 17, 13, 0),
-    gsSP1Quadrangle(14, 18, 17, 16, 0),
+    gsSP2Triangles(14, 18, 17, 0, 14, 17, 16, 0),
     gsSP2Triangles(14, 16, 15, 0, 16, 19, 15, 0),
     gsSP2Triangles(12, 19, 16, 0, 15, 19, 12, 0),
     gsSP2Triangles(20, 1, 21, 0, 22, 6, 20, 0),
@@ -3827,30 +3827,30 @@ Gfx d_course_banshee_boardwalk_dl_7978[] =
     gsSP2Triangles(24, 25, 30, 0, 30, 25, 27, 0),
     gsSP2Triangles(30, 27, 31, 0, 31, 27, 28, 0),
     gsSPVertex(d_course_banshee_boardwalk_cheep_cheep8, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(3, 1, 0, 0, 0, 4, 5, 0),
     gsSP2Triangles(5, 6, 0, 0, 0, 6, 4, 0),
     gsSP2Triangles(1, 7, 8, 0, 2, 1, 8, 0),
     gsSP2Triangles(3, 7, 1, 0, 2, 8, 3, 0),
     gsSP2Triangles(3, 8, 7, 0, 9, 6, 10, 0),
     gsSP2Triangles(9, 4, 6, 0, 4, 9, 5, 0),
-    gsSP1Quadrangle(5, 9, 10, 6, 0),
+    gsSP2Triangles(5, 9, 10, 0, 5, 10, 6, 0),
     gsSP2Triangles(11, 12, 13, 0, 11, 14, 12, 0),
     gsSP2Triangles(5, 11, 15, 0, 11, 13, 15, 0),
     gsSP2Triangles(5, 14, 11, 0, 15, 13, 12, 0),
-    gsSP1Quadrangle(15, 12, 14, 5, 0),
+    gsSP2Triangles(15, 12, 14, 0, 15, 14, 5, 0),
     gsSP2Triangles(16, 17, 18, 0, 16, 19, 17, 0),
     gsSP2Triangles(18, 20, 16, 0, 16, 20, 19, 0),
     gsSP2Triangles(17, 19, 20, 0, 17, 21, 18, 0),
     gsSP2Triangles(22, 21, 17, 0, 17, 20, 23, 0),
-    gsSP1Quadrangle(18, 21, 22, 23, 0),
+    gsSP2Triangles(18, 21, 22, 0, 18, 22, 23, 0),
     gsSP2Triangles(18, 23, 20, 0, 24, 25, 26, 0),
     gsSP2Triangles(26, 27, 24, 0, 24, 27, 26, 0),
     gsSP2Triangles(26, 25, 24, 0, 28, 29, 26, 0),
     gsSP2Triangles(27, 28, 26, 0, 26, 30, 27, 0),
     gsSP1Triangle(26, 29, 30, 0),
     gsSPVertex(d_course_banshee_boardwalk_cheep_cheep9, 10, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(2, 4, 0, 0, 0, 4, 2, 0),
     gsSP2Triangles(1, 5, 2, 0, 2, 5, 3, 0),
     gsSP2Triangles(6, 7, 8, 0, 4, 9, 2, 0),
@@ -3978,11 +3978,11 @@ Gfx d_course_banshee_boardwalk_dl_A850[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(d_course_bashee_boardwalk_unknown_model1, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4002,11 +4002,11 @@ Gfx d_course_banshee_boardwalk_dl_A900[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(d_course_bashee_boardwalk_unknown_model2, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4064,7 +4064,7 @@ Gfx d_course_banshee_boardwalk_dl_B278[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(d_course_banshee_boardwalk_model_unk, 9, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 0, 2, 0),
-    gsSP1Quadrangle(2, 1, 4, 5, 0),
+    gsSP2Triangles(2, 1, 4, 0, 2, 4, 5, 0),
     gsSP2Triangles(2, 5, 6, 0, 7, 2, 6, 0),
     gsSP2Triangles(8, 3, 2, 0, 7, 8, 2, 0),
     gsSPEndDisplayList(),
diff --git a/courses/special_cup/banshee_boardwalk/packed.inc.c b/courses/special_cup/banshee_boardwalk/packed.inc.c
index 9d76efa9e..769ac1341 100644
--- a/courses/special_cup/banshee_boardwalk/packed.inc.c
+++ b/courses/special_cup/banshee_boardwalk/packed.inc.c
@@ -18,7 +18,7 @@ Gfx d_course_banshee_boardwalk_packed_dl_0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000000, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -40,7 +40,7 @@ Gfx d_course_banshee_boardwalk_packed_dl_70[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000040, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 6, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x007C),
@@ -50,7 +50,7 @@ Gfx d_course_banshee_boardwalk_packed_dl_70[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04000080, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -66,7 +66,7 @@ Gfx d_course_banshee_boardwalk_packed_dl_120[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040000C0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 6, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x007C),
@@ -76,7 +76,7 @@ Gfx d_course_banshee_boardwalk_packed_dl_120[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04000100, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -92,7 +92,7 @@ Gfx d_course_banshee_boardwalk_packed_dl_1D0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000140, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 6, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x007C),
@@ -102,7 +102,7 @@ Gfx d_course_banshee_boardwalk_packed_dl_1D0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04000180, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -118,7 +118,7 @@ Gfx d_course_banshee_boardwalk_packed_dl_280[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040001C0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 6, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x007C),
@@ -128,7 +128,7 @@ Gfx d_course_banshee_boardwalk_packed_dl_280[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04000200, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -144,7 +144,7 @@ Gfx d_course_banshee_boardwalk_packed_dl_330[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000240, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 6, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x007C),
@@ -154,7 +154,7 @@ Gfx d_course_banshee_boardwalk_packed_dl_330[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04000280, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -170,7 +170,7 @@ Gfx d_course_banshee_boardwalk_packed_dl_3E0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040002C0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 6, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x007C),
@@ -180,7 +180,7 @@ Gfx d_course_banshee_boardwalk_packed_dl_3E0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04000300, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -196,7 +196,7 @@ Gfx d_course_banshee_boardwalk_packed_dl_490[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000340, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 6, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x007C),
@@ -206,7 +206,7 @@ Gfx d_course_banshee_boardwalk_packed_dl_490[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04000380, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -234,28 +234,28 @@ Gfx d_course_banshee_boardwalk_packed_dl_580[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040003C0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05008800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04000400, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05009800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04000440, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500A800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04000480, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -277,7 +277,7 @@ Gfx d_course_banshee_boardwalk_packed_dl_698[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040004C0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -293,7 +293,7 @@ Gfx d_course_banshee_boardwalk_packed_dl_6F8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04000500, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -309,7 +309,7 @@ Gfx d_course_banshee_boardwalk_packed_dl_758[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04000540, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -325,7 +325,7 @@ Gfx d_course_banshee_boardwalk_packed_dl_7B8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04000580, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -341,7 +341,7 @@ Gfx d_course_banshee_boardwalk_packed_dl_818[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040005C0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -367,12 +367,12 @@ Gfx d_course_banshee_boardwalk_packed_dl_8A8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000600, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(6, 8, 9, 7, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(16, 18, 19, 17, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(6, 8, 9, 0, 6, 9, 7, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(16, 18, 19, 0, 16, 19, 17, 0),
     gsSPEndDisplayList(),
 };
 
@@ -388,12 +388,12 @@ Gfx d_course_banshee_boardwalk_packed_dl_930[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000740, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -409,14 +409,14 @@ Gfx d_course_banshee_boardwalk_packed_dl_9B8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040008C0, 28, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(10, 12, 13, 11, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 22, 25, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(10, 12, 13, 0, 10, 13, 11, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 22, 0, 26, 22, 25, 0),
     gsSPEndDisplayList(),
 };
 
@@ -432,14 +432,14 @@ Gfx d_course_banshee_boardwalk_packed_dl_A50[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000A80, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -455,23 +455,23 @@ Gfx d_course_banshee_boardwalk_packed_dl_AE8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000C80, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(24, 26, 27, 25, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(24, 26, 27, 0, 24, 27, 25, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04000E80, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(10, 12, 13, 11, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(15, 18, 19, 16, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(10, 12, 13, 0, 10, 13, 11, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(15, 18, 19, 0, 15, 19, 16, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -487,21 +487,21 @@ Gfx d_course_banshee_boardwalk_packed_dl_BC8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04001000, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(8, 10, 11, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(18, 20, 21, 19, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
-    gsSP1Quadrangle(28, 30, 31, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(18, 20, 21, 0, 18, 21, 19, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
+    gsSP2Triangles(28, 30, 31, 0, 28, 31, 29, 0),
     gsSPVertex(0x04001200, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(8, 10, 11, 9, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0),
     gsSPEndDisplayList(),
 };
 
@@ -517,14 +517,14 @@ Gfx d_course_banshee_boardwalk_packed_dl_C98[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040012C0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -540,19 +540,19 @@ Gfx d_course_banshee_boardwalk_packed_dl_D30[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040014C0, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(6, 8, 9, 7, 0),
-    gsSP1Quadrangle(3, 2, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(14, 16, 17, 15, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 21, 24, 0),
-    gsSP1Quadrangle(25, 26, 27, 28, 0),
-    gsSP1Quadrangle(26, 29, 30, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(6, 8, 9, 0, 6, 9, 7, 0),
+    gsSP2Triangles(3, 2, 10, 0, 3, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(14, 16, 17, 0, 14, 17, 15, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 21, 0, 22, 21, 24, 0),
+    gsSP2Triangles(25, 26, 27, 0, 25, 27, 28, 0),
+    gsSP2Triangles(26, 29, 30, 0, 26, 30, 27, 0),
     gsSPVertex(0x040016B0, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -568,17 +568,17 @@ Gfx d_course_banshee_boardwalk_packed_dl_DF0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04001710, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(7, 6, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(22, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(7, 6, 8, 0, 7, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(22, 25, 26, 0, 22, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04001910, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -594,23 +594,23 @@ Gfx d_course_banshee_boardwalk_packed_dl_EA0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04001950, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(12, 11, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(12, 11, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04001B50, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(5, 8, 9, 6, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(16, 18, 19, 17, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(5, 8, 9, 0, 5, 9, 6, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(16, 18, 19, 0, 16, 19, 17, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -626,12 +626,12 @@ Gfx d_course_banshee_boardwalk_packed_dl_F80[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04001CD0, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(17, 16, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(17, 16, 18, 0, 17, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -647,27 +647,27 @@ Gfx d_course_banshee_boardwalk_packed_dl_1008[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04001E10, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(7, 6, 8, 9, 0),
-    gsSP1Quadrangle(9, 8, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(15, 14, 16, 17, 0),
-    gsSP1Quadrangle(17, 16, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 20, 23, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(7, 6, 8, 0, 7, 8, 9, 0),
+    gsSP2Triangles(9, 8, 10, 0, 9, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(15, 14, 16, 0, 15, 16, 17, 0),
+    gsSP2Triangles(17, 16, 18, 0, 17, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 20, 0, 24, 20, 23, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPVertex(0x04001FF0, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 5, 4, 9, 0),
-    gsSP1Quadrangle(7, 6, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(14, 16, 17, 15, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(20, 22, 23, 21, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 19, 18, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 5, 4, 0, 8, 4, 9, 0),
+    gsSP2Triangles(7, 6, 10, 0, 7, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(14, 16, 17, 0, 14, 17, 15, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 19, 18, 0, 28, 18, 29, 0),
     gsSPEndDisplayList(),
 };
 
@@ -683,21 +683,21 @@ Gfx d_course_banshee_boardwalk_packed_dl_1108[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040021D0, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(18, 20, 21, 19, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(18, 20, 21, 0, 18, 21, 19, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPVertex(0x040023B0, 22, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(10, 12, 13, 11, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(10, 12, 13, 0, 10, 13, 11, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
     gsSPEndDisplayList(),
 };
 
@@ -713,12 +713,12 @@ Gfx d_course_banshee_boardwalk_packed_dl_11D8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04002510, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -734,19 +734,19 @@ Gfx d_course_banshee_boardwalk_packed_dl_1260[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04002690, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(10, 12, 13, 11, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(16, 18, 19, 17, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(10, 12, 13, 0, 10, 13, 11, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(16, 18, 19, 0, 16, 19, 17, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04002890, 10, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(6, 8, 9, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(6, 8, 9, 0, 6, 9, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -762,19 +762,19 @@ Gfx d_course_banshee_boardwalk_packed_dl_1320[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04002930, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 0, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(8, 10, 11, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 20, 23, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 0, 0, 4, 0, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 20, 23, 0, 24, 23, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPVertex(0x04002B10, 10, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsSPEndDisplayList(),
 };
 
@@ -790,14 +790,14 @@ Gfx d_course_banshee_boardwalk_packed_dl_13E0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04002BB0, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(14, 15, 12, 13, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(22, 23, 20, 21, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(14, 15, 12, 0, 14, 12, 13, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(22, 23, 20, 0, 22, 20, 21, 0),
     gsSPEndDisplayList(),
 };
 
@@ -813,24 +813,24 @@ Gfx d_course_banshee_boardwalk_packed_dl_1478[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04002D30, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 1, 0, 0),
-    gsSP1Quadrangle(2, 6, 7, 3, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(10, 9, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 8, 11, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
-    gsSP1Quadrangle(30, 31, 28, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0),
+    gsSP2Triangles(2, 6, 7, 0, 2, 7, 3, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(10, 9, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 8, 0, 14, 8, 11, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
+    gsSP2Triangles(30, 31, 28, 0, 30, 28, 29, 0),
     gsSPVertex(0x04002F30, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(7, 10, 11, 8, 0),
-    gsSP1Quadrangle(12, 13, 11, 10, 0),
-    gsSP1Quadrangle(14, 0, 3, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(7, 10, 11, 0, 7, 11, 8, 0),
+    gsSP2Triangles(12, 13, 11, 0, 12, 11, 10, 0),
+    gsSP2Triangles(14, 0, 3, 0, 14, 3, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -846,17 +846,17 @@ Gfx d_course_banshee_boardwalk_packed_dl_1560[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04003030, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(7, 6, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
-    gsSP1Quadrangle(29, 28, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(7, 6, 8, 0, 7, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
+    gsSP2Triangles(29, 28, 30, 0, 29, 30, 31, 0),
     gsSPVertex(0x04003230, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -872,34 +872,34 @@ Gfx d_course_banshee_boardwalk_packed_dl_1610[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04003270, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(6, 5, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(13, 12, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(19, 18, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
-    gsSP1Quadrangle(21, 20, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(6, 5, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(13, 12, 14, 0, 13, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(19, 18, 20, 0, 19, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
+    gsSP2Triangles(21, 20, 30, 0, 21, 30, 31, 0),
     gsSPVertex(0x04003470, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 0, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(11, 14, 15, 12, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(23, 22, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
-    gsSP1Quadrangle(30, 26, 29, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 0, 0, 4, 0, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(11, 14, 15, 0, 11, 15, 12, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(23, 22, 24, 0, 23, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
+    gsSP2Triangles(30, 26, 29, 0, 30, 29, 31, 0),
     gsSPVertex(0x04003670, 22, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(13, 16, 17, 14, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(13, 16, 17, 0, 13, 17, 14, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
     gsSPEndDisplayList(),
 };
 
@@ -956,17 +956,17 @@ Gfx d_course_banshee_boardwalk_packed_dl_1830[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040037D0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(4, 7, 8, 0, 5, 9, 6, 0),
     gsSP2Triangles(8, 7, 10, 0, 11, 12, 13, 0),
     gsSP2Triangles(11, 13, 14, 0, 12, 11, 15, 0),
     gsSP2Triangles(12, 15, 16, 0, 17, 8, 10, 0),
-    gsSP1Quadrangle(8, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(20, 24, 25, 21, 0),
-    gsSP1Quadrangle(22, 26, 27, 23, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(8, 17, 18, 0, 8, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(20, 24, 25, 0, 20, 25, 21, 0),
+    gsSP2Triangles(22, 26, 27, 0, 22, 27, 23, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1003,14 +1003,14 @@ Gfx d_course_banshee_boardwalk_packed_dl_1968[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04003B20, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 4, 7, 8, 0),
     gsSP2Triangles(7, 4, 6, 0, 9, 7, 6, 0),
-    gsSP1Quadrangle(9, 6, 10, 11, 0),
-    gsSP1Quadrangle(12, 7, 9, 13, 0),
+    gsSP2Triangles(9, 6, 10, 0, 9, 10, 11, 0),
+    gsSP2Triangles(12, 7, 9, 0, 12, 9, 13, 0),
     gsSP2Triangles(7, 14, 8, 0, 14, 15, 8, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1026,14 +1026,14 @@ Gfx d_course_banshee_boardwalk_packed_dl_1A00[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04003CA0, 26, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(0, 4, 5, 1, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(0, 4, 5, 0, 0, 5, 1, 0),
     gsSP2Triangles(6, 7, 8, 0, 7, 6, 9, 0),
-    gsSP1Quadrangle(10, 7, 9, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(10, 7, 9, 0, 10, 9, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 19, 20, 21, 0),
-    gsSP1Quadrangle(20, 3, 2, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
+    gsSP2Triangles(20, 3, 2, 0, 20, 2, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1061,9 +1061,9 @@ Gfx d_course_banshee_boardwalk_packed_dl_1AC0[] =
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
     gsSP2Triangles(3, 0, 4, 0, 3, 5, 6, 0),
     gsSP2Triangles(3, 6, 1, 0, 7, 8, 2, 0),
-    gsSP1Quadrangle(9, 10, 5, 3, 0),
+    gsSP2Triangles(9, 10, 5, 0, 9, 5, 3, 0),
     gsSP2Triangles(11, 3, 4, 0, 11, 9, 3, 0),
-    gsSP1Quadrangle(12, 13, 7, 6, 0),
+    gsSP2Triangles(12, 13, 7, 0, 12, 7, 6, 0),
     gsSP2Triangles(14, 15, 10, 0, 15, 12, 5, 0),
     gsSP2Triangles(15, 5, 10, 0, 5, 12, 6, 0),
     gsSPEndDisplayList(),
@@ -1081,11 +1081,11 @@ Gfx d_course_banshee_boardwalk_packed_dl_1B58[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04003F40, 13, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(0, 3, 4, 0, 2, 5, 6, 0),
-    gsSP1Quadrangle(1, 7, 5, 2, 0),
-    gsSP1Quadrangle(3, 2, 8, 9, 0),
-    gsSP1Quadrangle(2, 6, 10, 8, 0),
+    gsSP2Triangles(1, 7, 5, 0, 1, 5, 2, 0),
+    gsSP2Triangles(3, 2, 8, 0, 3, 8, 9, 0),
+    gsSP2Triangles(2, 6, 10, 0, 2, 10, 8, 0),
     gsSP2Triangles(10, 11, 8, 0, 8, 12, 9, 0),
     gsSPEndDisplayList(),
 };
@@ -1109,11 +1109,11 @@ Gfx d_course_banshee_boardwalk_packed_dl_1BF8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04004010, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1129,11 +1129,11 @@ Gfx d_course_banshee_boardwalk_packed_dl_1C78[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04004150, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1156,13 +1156,13 @@ Gfx d_course_banshee_boardwalk_packed_dl_1D10[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04004290, 26, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(6, 5, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(6, 5, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1379,21 +1379,21 @@ Gfx d_course_banshee_boardwalk_packed_dl_22C8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04005AF0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05006000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04005BB0, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(16, 18, 19, 17, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(16, 18, 19, 0, 16, 19, 17, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1410,15 +1410,15 @@ Gfx d_course_banshee_boardwalk_packed_dl_2398[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04005CF0, 8, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(3, 5, 6, 7, 0),
+    gsSP2Triangles(3, 5, 6, 0, 3, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05006000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04005D70, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1434,23 +1434,23 @@ Gfx d_course_banshee_boardwalk_packed_dl_2440[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04005DF0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05006000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04005EF0, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(8, 10, 11, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1466,24 +1466,24 @@ Gfx d_course_banshee_boardwalk_packed_dl_2520[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04006070, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05006000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04006170, 28, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(8, 10, 11, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1499,23 +1499,23 @@ Gfx d_course_banshee_boardwalk_packed_dl_2608[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04006330, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05006000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04006430, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(8, 10, 11, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1531,24 +1531,24 @@ Gfx d_course_banshee_boardwalk_packed_dl_26E8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040065B0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05006000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040066B0, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(8, 10, 11, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(14, 16, 17, 15, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(20, 22, 23, 21, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(14, 16, 17, 0, 14, 17, 15, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1564,27 +1564,27 @@ Gfx d_course_banshee_boardwalk_packed_dl_27D0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04006830, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05006000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040068B0, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05005800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04006A30, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1600,21 +1600,21 @@ Gfx d_course_banshee_boardwalk_packed_dl_28D0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04006A70, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05006000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04006B30, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(6, 8, 9, 7, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(10, 14, 15, 11, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(6, 8, 9, 0, 6, 9, 7, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(10, 14, 15, 0, 10, 15, 11, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1630,21 +1630,21 @@ Gfx d_course_banshee_boardwalk_packed_dl_29A0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04006C70, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05006000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04006D30, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1660,28 +1660,28 @@ Gfx d_course_banshee_boardwalk_packed_dl_2A70[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04006EB0, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05006000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04006FF0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 0, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(8, 10, 11, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 0, 0, 4, 0, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x040071F0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1697,16 +1697,16 @@ Gfx d_course_banshee_boardwalk_packed_dl_2B78[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04007230, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05006000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040072B0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1722,31 +1722,31 @@ Gfx d_course_banshee_boardwalk_packed_dl_2C20[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04007330, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05006000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040074B0, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 0, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(8, 10, 11, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(14, 16, 17, 15, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(20, 22, 23, 21, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 24, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 0, 0, 4, 0, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(14, 16, 17, 0, 14, 17, 15, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 24, 0, 28, 24, 27, 0),
     gsSPVertex(0x04007690, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1762,27 +1762,27 @@ Gfx d_course_banshee_boardwalk_packed_dl_2D40[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040076F0, 22, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(0, 3, 4, 0, 5, 6, 7, 0),
-    gsSP1Quadrangle(5, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
+    gsSP2Triangles(5, 7, 8, 0, 5, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05006000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04007850, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(6, 8, 9, 7, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(14, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(6, 8, 9, 0, 6, 9, 7, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(14, 17, 18, 0, 14, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1801,23 +1801,23 @@ Gfx d_course_banshee_boardwalk_packed_dl_2E40[] =
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 4, 0),
     gsSP2Triangles(0, 4, 1, 0, 5, 6, 7, 0),
     gsSP2Triangles(5, 7, 8, 0, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05006000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04007B90, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(6, 8, 9, 7, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(14, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(6, 8, 9, 0, 6, 9, 7, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(14, 17, 18, 0, 14, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1833,24 +1833,24 @@ Gfx d_course_banshee_boardwalk_packed_dl_2F38[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04007D90, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05006000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04007E90, 28, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(6, 8, 9, 7, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(10, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(6, 8, 9, 0, 6, 9, 7, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(10, 13, 14, 0, 10, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1866,21 +1866,21 @@ Gfx d_course_banshee_boardwalk_packed_dl_3020[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04008050, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05006000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04008110, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(6, 10, 11, 7, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(6, 10, 11, 0, 6, 11, 7, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1896,7 +1896,7 @@ Gfx d_course_banshee_boardwalk_packed_dl_30F0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04008250, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(0, 3, 4, 0, 5, 6, 7, 0),
     gsSP2Triangles(5, 7, 8, 0, 9, 10, 11, 0),
     gsSP2Triangles(9, 11, 12, 0, 13, 14, 15, 0),
@@ -1911,22 +1911,22 @@ Gfx d_course_banshee_boardwalk_packed_dl_30F0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04008440, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 10, 13, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 16, 19, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 10, 0, 14, 10, 13, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 16, 0, 20, 16, 19, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPVertex(0x04008620, 22, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(14, 16, 17, 15, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(14, 16, 17, 0, 14, 17, 15, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1942,21 +1942,21 @@ Gfx d_course_banshee_boardwalk_packed_dl_3240[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04008780, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05006000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04008840, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(16, 18, 19, 17, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(16, 18, 19, 0, 16, 19, 17, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1972,18 +1972,18 @@ Gfx d_course_banshee_boardwalk_packed_dl_3310[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04008980, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05006000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04008A00, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1999,22 +1999,22 @@ Gfx d_course_banshee_boardwalk_packed_dl_33C8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04008B00, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05006000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04008C00, 22, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 4, 7, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 4, 0, 8, 4, 7, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2030,24 +2030,24 @@ Gfx d_course_banshee_boardwalk_packed_dl_34A0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04008D60, 14, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(0, 3, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05006000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04008E40, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2089,9 +2089,9 @@ Gfx d_course_banshee_boardwalk_packed_dl_3638[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04009040, 21, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 5, 0),
     gsSP2Triangles(8, 5, 4, 0, 11, 12, 8, 0),
     gsSP2Triangles(11, 8, 4, 0, 13, 14, 15, 0),
     gsSP2Triangles(13, 15, 16, 0, 17, 18, 19, 0),
@@ -2111,10 +2111,10 @@ Gfx d_course_banshee_boardwalk_packed_dl_36C8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04009190, 14, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(9, 8, 12, 13, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(9, 8, 12, 0, 9, 12, 13, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2130,8 +2130,8 @@ Gfx d_course_banshee_boardwalk_packed_dl_3740[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04009270, 15, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(7, 6, 8, 0, 6, 9, 10, 0),
     gsSP2Triangles(6, 10, 8, 0, 11, 12, 13, 0),
     gsSP1Triangle(11, 13, 14, 0),
@@ -2150,7 +2150,7 @@ Gfx d_course_banshee_boardwalk_packed_dl_37C0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04009360, 7, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 3, 2, 0, 4, 5, 6, 0),
     gsSP1Triangle(4, 6, 3, 0),
     gsSPEndDisplayList(),
@@ -2168,8 +2168,8 @@ Gfx d_course_banshee_boardwalk_packed_dl_3830[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040093D0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
     gsSP2Triangles(2, 5, 6, 0, 7, 5, 7, 0),
     gsSP2Triangles(5, 5, 7, 0, 8, 9, 2, 0),
     gsSP2Triangles(8, 2, 6, 0, 10, 0, 3, 0),
@@ -2178,13 +2178,13 @@ Gfx d_course_banshee_boardwalk_packed_dl_3830[] =
     gsSP2Triangles(13, 16, 17, 0, 18, 19, 20, 0),
     gsSP2Triangles(18, 20, 21, 0, 22, 23, 24, 0),
     gsSP2Triangles(22, 24, 25, 0, 24, 23, 26, 0),
-    gsSP1Quadrangle(27, 24, 26, 28, 0),
-    gsSP1Quadrangle(29, 28, 30, 31, 0),
+    gsSP2Triangles(27, 24, 26, 0, 27, 26, 28, 0),
+    gsSP2Triangles(29, 28, 30, 0, 29, 30, 31, 0),
     gsSPVertex(0x040095D0, 25, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 2, 1, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 2, 1, 0, 4, 1, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
     gsSP2Triangles(11, 14, 15, 0, 16, 17, 18, 0),
     gsSP2Triangles(16, 18, 19, 0, 20, 21, 15, 0),
     gsSP2Triangles(20, 15, 22, 0, 22, 15, 23, 0),
@@ -2204,12 +2204,12 @@ Gfx d_course_banshee_boardwalk_packed_dl_3930[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04009760, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 0, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 5, 12, 0),
-    gsSP1Quadrangle(13, 14, 15, 16, 0),
-    gsSP1Quadrangle(17, 18, 19, 20, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 0, 0, 4, 0, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 5, 0, 10, 5, 12, 0),
+    gsSP2Triangles(13, 14, 15, 0, 13, 15, 16, 0),
+    gsSP2Triangles(17, 18, 19, 0, 17, 19, 20, 0),
     gsSP2Triangles(17, 20, 21, 0, 22, 23, 24, 0),
     gsSP2Triangles(22, 24, 25, 0, 25, 26, 27, 0),
     gsSP2Triangles(25, 27, 28, 0, 29, 30, 31, 0),
@@ -2221,24 +2221,24 @@ Gfx d_course_banshee_boardwalk_packed_dl_3930[] =
     gsSP2Triangles(15, 17, 18, 0, 19, 17, 20, 0),
     gsSP2Triangles(19, 20, 21, 0, 22, 23, 24, 0),
     gsSP2Triangles(22, 24, 25, 0, 26, 21, 20, 0),
-    gsSP1Quadrangle(26, 20, 27, 28, 0),
-    gsSP1Quadrangle(26, 28, 29, 30, 0),
+    gsSP2Triangles(26, 20, 27, 0, 26, 27, 28, 0),
+    gsSP2Triangles(26, 28, 29, 0, 26, 29, 30, 0),
     gsSP1Triangle(28, 31, 29, 0),
     gsSPVertex(0x04009B60, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(4, 6, 7, 8, 0),
-    gsSP1Quadrangle(3, 9, 6, 4, 0),
+    gsSP2Triangles(4, 6, 7, 0, 4, 7, 8, 0),
+    gsSP2Triangles(3, 9, 6, 0, 3, 6, 4, 0),
     gsSP2Triangles(4, 10, 5, 0, 5, 10, 11, 0),
     gsSP2Triangles(5, 11, 12, 0, 13, 5, 12, 0),
     gsSP2Triangles(13, 12, 14, 0, 3, 5, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSP2Triangles(20, 21, 22, 0, 23, 20, 22, 0),
     gsSP2Triangles(13, 24, 25, 0, 9, 26, 6, 0),
-    gsSP1Quadrangle(9, 0, 2, 26, 0),
+    gsSP2Triangles(9, 0, 2, 0, 9, 2, 26, 0),
     gsSP2Triangles(1, 27, 2, 0, 28, 29, 30, 0),
     gsSP1Triangle(28, 30, 31, 0),
     gsSPVertex(0x04009D60, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2254,19 +2254,19 @@ Gfx d_course_banshee_boardwalk_packed_dl_3AA0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04009DA0, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 2, 1, 0, 5, 6, 4, 0),
     gsSP2Triangles(5, 4, 1, 0, 7, 8, 9, 0),
     gsSP2Triangles(7, 9, 10, 0, 11, 12, 13, 0),
     gsSP2Triangles(11, 13, 14, 0, 13, 15, 14, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSP2Triangles(21, 24, 22, 0, 22, 24, 25, 0),
     gsSP2Triangles(22, 25, 26, 0, 27, 28, 29, 0),
     gsSP1Triangle(27, 29, 30, 0),
     gsSPVertex(0x04009F90, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 7, 9, 0, 7, 10, 11, 0),
     gsSP2Triangles(7, 11, 9, 0, 12, 13, 14, 0),
     gsSP2Triangles(12, 14, 15, 0, 16, 9, 11, 0),
@@ -2274,7 +2274,7 @@ Gfx d_course_banshee_boardwalk_packed_dl_3AA0[] =
     gsSP2Triangles(18, 11, 19, 0, 16, 18, 20, 0),
     gsSP2Triangles(16, 20, 21, 0, 22, 23, 24, 0),
     gsSP2Triangles(22, 24, 25, 0, 26, 27, 28, 0),
-    gsSP1Quadrangle(27, 29, 30, 28, 0),
+    gsSP2Triangles(27, 29, 30, 0, 27, 30, 28, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2290,7 +2290,7 @@ Gfx d_course_banshee_boardwalk_packed_dl_3BA0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400A180, 27, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 1, 0, 0, 0, 5, 4, 0),
     gsSP2Triangles(6, 6, 7, 0, 7, 6, 7, 0),
     gsSP2Triangles(8, 3, 2, 0, 8, 9, 10, 0),
@@ -2314,20 +2314,20 @@ Gfx d_course_banshee_boardwalk_packed_dl_3C40[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400A330, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(0, 3, 4, 5, 0),
-    gsSP1Quadrangle(0, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0),
+    gsSP2Triangles(0, 5, 6, 0, 0, 6, 7, 0),
     gsSP2Triangles(0, 7, 8, 0, 7, 9, 10, 0),
     gsSP2Triangles(7, 10, 8, 0, 1, 11, 12, 0),
     gsSP2Triangles(1, 12, 2, 0, 13, 14, 15, 0),
     gsSP2Triangles(13, 15, 16, 0, 16, 15, 17, 0),
     gsSP2Triangles(16, 17, 18, 0, 19, 20, 21, 0),
     gsSP2Triangles(19, 21, 22, 0, 23, 21, 20, 0),
-    gsSP1Quadrangle(24, 23, 20, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(24, 23, 20, 0, 24, 20, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPVertex(0x0400A510, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2343,8 +2343,8 @@ Gfx d_course_banshee_boardwalk_packed_dl_3D08[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400A590, 19, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 3, 2, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 3, 2, 0, 4, 2, 5, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(7, 9, 10, 0, 11, 12, 13, 0),
     gsSP2Triangles(11, 13, 14, 0, 15, 16, 17, 0),
@@ -2364,7 +2364,7 @@ Gfx d_course_banshee_boardwalk_packed_dl_3D90[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400A6C0, 14, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(2, 4, 3, 0, 5, 6, 7, 0),
     gsSP2Triangles(5, 7, 8, 0, 5, 9, 10, 0),
     gsSP2Triangles(5, 10, 11, 0, 12, 7, 6, 0),
@@ -2384,10 +2384,10 @@ Gfx d_course_banshee_boardwalk_packed_dl_3E10[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400A7A0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2403,10 +2403,10 @@ Gfx d_course_banshee_boardwalk_packed_dl_3E88[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400A8A0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2422,10 +2422,10 @@ Gfx d_course_banshee_boardwalk_packed_dl_3F00[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400A9A0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2441,13 +2441,13 @@ Gfx d_course_banshee_boardwalk_packed_dl_3F78[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400AAA0, 26, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(7, 8, 4, 0, 9, 10, 11, 0),
-    gsSP1Quadrangle(9, 11, 12, 13, 0),
+    gsSP2Triangles(9, 11, 12, 0, 9, 12, 13, 0),
     gsSP2Triangles(9, 13, 14, 0, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2463,8 +2463,8 @@ Gfx d_course_banshee_boardwalk_packed_dl_4008[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400AC40, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2480,7 +2480,7 @@ Gfx d_course_banshee_boardwalk_packed_dl_4070[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400ACC0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2496,8 +2496,8 @@ Gfx d_course_banshee_boardwalk_packed_dl_40D0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400AD00, 21, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(0, 4, 5, 1, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(0, 4, 5, 0, 0, 5, 1, 0),
     gsSP2Triangles(2, 6, 3, 0, 7, 8, 9, 0),
     gsSP2Triangles(7, 9, 10, 0, 11, 12, 13, 0),
     gsSP2Triangles(11, 13, 14, 0, 15, 12, 11, 0),
@@ -2541,17 +2541,17 @@ Gfx d_course_banshee_boardwalk_packed_dl_41F8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400AE50, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(16, 18, 19, 17, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(16, 18, 19, 0, 16, 19, 17, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0400B050, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2567,17 +2567,17 @@ Gfx d_course_banshee_boardwalk_packed_dl_42A8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400B090, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(16, 18, 19, 17, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(16, 18, 19, 0, 16, 19, 17, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0400B290, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2593,17 +2593,17 @@ Gfx d_course_banshee_boardwalk_packed_dl_4358[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400B2D0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(16, 18, 19, 17, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(16, 18, 19, 0, 16, 19, 17, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0400B4D0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2619,17 +2619,17 @@ Gfx d_course_banshee_boardwalk_packed_dl_4408[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400B510, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(16, 18, 19, 17, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(16, 18, 19, 0, 16, 19, 17, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0400B710, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2645,17 +2645,17 @@ Gfx d_course_banshee_boardwalk_packed_dl_44B8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400B750, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(16, 18, 19, 17, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(16, 18, 19, 0, 16, 19, 17, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0400B950, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2671,17 +2671,17 @@ Gfx d_course_banshee_boardwalk_packed_dl_4568[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400B990, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(18, 20, 21, 19, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(18, 20, 21, 0, 18, 21, 19, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPVertex(0x0400BB70, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2697,17 +2697,17 @@ Gfx d_course_banshee_boardwalk_packed_dl_4618[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400BBD0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(16, 18, 19, 17, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(16, 18, 19, 0, 16, 19, 17, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0400BDD0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2723,21 +2723,21 @@ Gfx d_course_banshee_boardwalk_packed_dl_46C8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400BE10, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 0, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 6, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 0, 0, 4, 0, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 6, 0, 10, 6, 9, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0400C010, 18, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 4, 7, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 4, 0, 8, 4, 7, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2753,17 +2753,17 @@ Gfx d_course_banshee_boardwalk_packed_dl_4798[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400C130, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(16, 18, 19, 17, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(16, 18, 19, 0, 16, 19, 17, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0400C330, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2779,17 +2779,17 @@ Gfx d_course_banshee_boardwalk_packed_dl_4848[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400C370, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(16, 18, 19, 17, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(16, 18, 19, 0, 16, 19, 17, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0400C570, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2805,17 +2805,17 @@ Gfx d_course_banshee_boardwalk_packed_dl_48F8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400C5B0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(16, 18, 19, 17, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(16, 18, 19, 0, 16, 19, 17, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0400C7B0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2831,17 +2831,17 @@ Gfx d_course_banshee_boardwalk_packed_dl_49A8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400C7F0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(16, 18, 19, 17, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(16, 18, 19, 0, 16, 19, 17, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0400C9F0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2857,17 +2857,17 @@ Gfx d_course_banshee_boardwalk_packed_dl_4A58[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400CA30, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(16, 18, 19, 17, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(16, 18, 19, 0, 16, 19, 17, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0400CC30, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2883,14 +2883,14 @@ Gfx d_course_banshee_boardwalk_packed_dl_4B08[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400CC70, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2906,17 +2906,17 @@ Gfx d_course_banshee_boardwalk_packed_dl_4BA0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400CE70, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(16, 18, 19, 17, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(16, 18, 19, 0, 16, 19, 17, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0400D070, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2932,17 +2932,17 @@ Gfx d_course_banshee_boardwalk_packed_dl_4C50[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400D0B0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(16, 18, 19, 17, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(16, 18, 19, 0, 16, 19, 17, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0400D2B0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2958,17 +2958,17 @@ Gfx d_course_banshee_boardwalk_packed_dl_4D00[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400D2F0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(16, 18, 19, 17, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(16, 18, 19, 0, 16, 19, 17, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0400D4F0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2984,17 +2984,17 @@ Gfx d_course_banshee_boardwalk_packed_dl_4DB0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400D530, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(16, 18, 19, 17, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(16, 18, 19, 0, 16, 19, 17, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0400D730, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3033,15 +3033,15 @@ Gfx d_course_banshee_boardwalk_packed_dl_4EF8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400D770, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(1, 4, 2, 0, 4, 5, 6, 0),
     gsSP2Triangles(4, 6, 2, 0, 5, 7, 8, 0),
     gsSP2Triangles(5, 8, 6, 0, 9, 10, 11, 0),
-    gsSP1Quadrangle(9, 11, 12, 13, 0),
-    gsSP1Quadrangle(12, 14, 15, 13, 0),
+    gsSP2Triangles(9, 11, 12, 0, 9, 12, 13, 0),
+    gsSP2Triangles(12, 14, 15, 0, 12, 15, 13, 0),
     gsSP2Triangles(16, 17, 18, 0, 19, 6, 8, 0),
-    gsSP1Quadrangle(19, 8, 16, 20, 0),
-    gsSP1Quadrangle(21, 19, 20, 22, 0),
+    gsSP2Triangles(19, 8, 16, 0, 19, 16, 20, 0),
+    gsSP2Triangles(21, 19, 20, 0, 21, 20, 22, 0),
     gsSP2Triangles(8, 23, 16, 0, 16, 18, 20, 0),
     gsSP2Triangles(10, 24, 11, 0, 25, 26, 27, 0),
     gsSP2Triangles(25, 27, 28, 0, 29, 30, 28, 0),
@@ -3064,15 +3064,15 @@ Gfx d_course_banshee_boardwalk_packed_dl_4FD0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400D9B0, 27, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(4, 7, 8, 0, 9, 10, 11, 0),
-    gsSP1Quadrangle(10, 12, 13, 11, 0),
+    gsSP2Triangles(10, 12, 13, 0, 10, 13, 11, 0),
     gsSP2Triangles(12, 14, 13, 0, 15, 16, 17, 0),
     gsSP2Triangles(15, 17, 12, 0, 12, 17, 14, 0),
-    gsSP1Quadrangle(12, 10, 18, 19, 0),
-    gsSP1Quadrangle(20, 17, 21, 22, 0),
-    gsSP1Quadrangle(0, 23, 24, 25, 0),
+    gsSP2Triangles(12, 10, 18, 0, 12, 18, 19, 0),
+    gsSP2Triangles(20, 17, 21, 0, 20, 21, 22, 0),
+    gsSP2Triangles(0, 23, 24, 0, 0, 24, 25, 0),
     gsSP1Triangle(0, 26, 1, 0),
     gsSPEndDisplayList(),
 };
@@ -3089,15 +3089,15 @@ Gfx d_course_banshee_boardwalk_packed_dl_5078[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400DB60, 25, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(4, 7, 8, 0, 7, 6, 9, 0),
     gsSP2Triangles(7, 9, 10, 0, 11, 12, 13, 0),
-    gsSP1Quadrangle(11, 13, 14, 15, 0),
-    gsSP1Quadrangle(11, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 15, 14, 0),
-    gsSP1Quadrangle(16, 20, 21, 17, 0),
-    gsSP1Quadrangle(22, 23, 24, 1, 0),
+    gsSP2Triangles(11, 13, 14, 0, 11, 14, 15, 0),
+    gsSP2Triangles(11, 15, 16, 0, 11, 16, 17, 0),
+    gsSP2Triangles(18, 19, 15, 0, 18, 15, 14, 0),
+    gsSP2Triangles(16, 20, 21, 0, 16, 21, 17, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 1, 0),
     gsSP1Triangle(0, 22, 1, 0),
     gsSPEndDisplayList(),
 };
@@ -3114,16 +3114,16 @@ Gfx d_course_banshee_boardwalk_packed_dl_5120[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400DCF0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 0, 3, 0, 0, 5, 6, 0),
     gsSP2Triangles(0, 6, 1, 0, 7, 4, 3, 0),
     gsSP2Triangles(7, 3, 8, 0, 9, 4, 7, 0),
     gsSP2Triangles(9, 7, 10, 0, 11, 7, 8, 0),
-    gsSP1Quadrangle(5, 9, 10, 6, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(5, 9, 10, 0, 5, 10, 6, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSP2Triangles(12, 15, 16, 0, 14, 17, 18, 0),
     gsSP2Triangles(14, 18, 15, 0, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 20, 19, 23, 0),
+    gsSP2Triangles(22, 20, 19, 0, 22, 19, 23, 0),
     gsSP2Triangles(20, 24, 21, 0, 25, 26, 27, 0),
     gsSP2Triangles(25, 27, 28, 0, 27, 29, 30, 0),
     gsSP2Triangles(27, 30, 31, 0, 28, 27, 31, 0),
@@ -3142,14 +3142,14 @@ Gfx d_course_banshee_boardwalk_packed_dl_51E0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400DEF0, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 4, 5, 0, 0),
-    gsSP1Quadrangle(6, 7, 2, 1, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 4, 5, 0, 3, 5, 0, 0),
+    gsSP2Triangles(6, 7, 2, 0, 6, 2, 1, 0),
     gsSP2Triangles(6, 8, 7, 0, 5, 4, 7, 0),
     gsSP2Triangles(5, 7, 8, 0, 9, 10, 11, 0),
     gsSP2Triangles(9, 11, 12, 0, 13, 14, 15, 0),
-    gsSP1Quadrangle(13, 15, 16, 17, 0),
-    gsSP1Quadrangle(14, 18, 19, 15, 0),
+    gsSP2Triangles(13, 15, 16, 0, 13, 16, 17, 0),
+    gsSP2Triangles(14, 18, 19, 0, 14, 19, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3165,11 +3165,11 @@ Gfx d_course_banshee_boardwalk_packed_dl_5278[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400E030, 14, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 8, 7, 0),
-    gsSP1Quadrangle(12, 13, 10, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 8, 0, 10, 8, 7, 0),
+    gsSP2Triangles(12, 13, 10, 0, 12, 10, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3185,9 +3185,9 @@ Gfx d_course_banshee_boardwalk_packed_dl_52F8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400E110, 15, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 3, 2, 0, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsSP2Triangles(6, 9, 10, 0, 11, 12, 13, 0),
     gsSP1Triangle(11, 13, 14, 0),
     gsSPEndDisplayList(),
@@ -3217,23 +3217,23 @@ Gfx d_course_banshee_boardwalk_packed_dl_53B8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400E200, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 9, 11, 10, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(20, 24, 25, 21, 0),
-    gsSP1Quadrangle(24, 26, 27, 25, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(20, 24, 25, 0, 20, 25, 21, 0),
+    gsSP2Triangles(24, 26, 27, 0, 24, 27, 25, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0400E400, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3255,8 +3255,8 @@ Gfx d_course_banshee_boardwalk_packed_dl_54A8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400E5E0, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 11, 12, 13, 0),
     gsSP2Triangles(14, 15, 16, 0, 17, 18, 19, 0),
     gsSPEndDisplayList(),
@@ -3274,8 +3274,8 @@ Gfx d_course_banshee_boardwalk_packed_dl_5520[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400E720, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 11, 12, 13, 0),
     gsSP2Triangles(14, 15, 16, 0, 17, 18, 19, 0),
     gsSPEndDisplayList(),
@@ -3293,8 +3293,8 @@ Gfx d_course_banshee_boardwalk_packed_dl_5598[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400E860, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 11, 12, 13, 0),
     gsSP2Triangles(14, 15, 16, 0, 17, 18, 19, 0),
     gsSPEndDisplayList(),
@@ -3312,8 +3312,8 @@ Gfx d_course_banshee_boardwalk_packed_dl_5610[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400E9A0, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 11, 12, 13, 0),
     gsSP2Triangles(14, 15, 16, 0, 17, 18, 19, 0),
     gsSPEndDisplayList(),
@@ -3331,8 +3331,8 @@ Gfx d_course_banshee_boardwalk_packed_dl_5688[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400EAE0, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 11, 12, 13, 0),
     gsSP2Triangles(14, 15, 16, 0, 17, 18, 19, 0),
     gsSPEndDisplayList(),
@@ -3350,8 +3350,8 @@ Gfx d_course_banshee_boardwalk_packed_dl_5700[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400EC20, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 11, 12, 13, 0),
     gsSP2Triangles(14, 15, 16, 0, 17, 18, 19, 0),
     gsSPEndDisplayList(),
@@ -3369,12 +3369,12 @@ Gfx d_course_banshee_boardwalk_packed_dl_5778[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400ED60, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(10, 11, 12, 0, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSP1Triangle(28, 29, 30, 0),
     gsSPVertex(0x0400EF50, 9, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
@@ -3394,8 +3394,8 @@ Gfx d_course_banshee_boardwalk_packed_dl_5820[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400EFE0, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 11, 12, 13, 0),
     gsSP2Triangles(14, 15, 16, 0, 17, 18, 19, 0),
     gsSPEndDisplayList(),
@@ -3413,8 +3413,8 @@ Gfx d_course_banshee_boardwalk_packed_dl_5898[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400F120, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 11, 12, 13, 0),
     gsSP2Triangles(14, 15, 16, 0, 17, 18, 19, 0),
     gsSPEndDisplayList(),
@@ -3432,8 +3432,8 @@ Gfx d_course_banshee_boardwalk_packed_dl_5910[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400F260, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 11, 12, 13, 0),
     gsSP2Triangles(14, 15, 16, 0, 17, 18, 19, 0),
     gsSPEndDisplayList(),
@@ -3451,8 +3451,8 @@ Gfx d_course_banshee_boardwalk_packed_dl_5988[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400F3A0, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 11, 12, 13, 0),
     gsSP2Triangles(14, 15, 16, 0, 17, 18, 19, 0),
     gsSPEndDisplayList(),
@@ -3470,8 +3470,8 @@ Gfx d_course_banshee_boardwalk_packed_dl_5A00[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400F4E0, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 11, 12, 13, 0),
     gsSP2Triangles(14, 15, 16, 0, 17, 18, 19, 0),
     gsSPEndDisplayList(),
@@ -3489,8 +3489,8 @@ Gfx d_course_banshee_boardwalk_packed_dl_5A78[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400F620, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 11, 12, 13, 0),
     gsSP2Triangles(14, 15, 16, 0, 17, 18, 19, 0),
     gsSPEndDisplayList(),
@@ -3508,8 +3508,8 @@ Gfx d_course_banshee_boardwalk_packed_dl_5AF0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400F760, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 11, 12, 13, 0),
     gsSP2Triangles(14, 15, 16, 0, 17, 18, 19, 0),
     gsSPEndDisplayList(),
@@ -3527,8 +3527,8 @@ Gfx d_course_banshee_boardwalk_packed_dl_5B68[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400F8A0, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 11, 12, 13, 0),
     gsSP2Triangles(14, 15, 16, 0, 17, 18, 19, 0),
     gsSPEndDisplayList(),
@@ -3546,8 +3546,8 @@ Gfx d_course_banshee_boardwalk_packed_dl_5BE0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400F9E0, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 11, 12, 13, 0),
     gsSP2Triangles(14, 15, 16, 0, 17, 18, 19, 0),
     gsSPEndDisplayList(),
@@ -3565,8 +3565,8 @@ Gfx d_course_banshee_boardwalk_packed_dl_5C58[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400FB20, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 11, 12, 13, 0),
     gsSP2Triangles(14, 15, 16, 0, 17, 18, 19, 0),
     gsSPEndDisplayList(),
@@ -3741,27 +3741,27 @@ Gfx d_course_banshee_boardwalk_packed_dl_6098[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04010200, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(0, 3, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(8, 7, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(12, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 21, 20, 0),
-    gsSP1Quadrangle(23, 22, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 25, 24, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(8, 7, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(12, 15, 16, 0, 12, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 21, 0, 22, 21, 20, 0),
+    gsSP2Triangles(23, 22, 24, 0, 23, 24, 25, 0),
+    gsSP2Triangles(26, 27, 25, 0, 26, 25, 24, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04010400, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 3, 5, 6, 0),
-    gsSP1Quadrangle(7, 8, 9, 10, 0),
-    gsSP1Quadrangle(10, 9, 11, 12, 0),
-    gsSP1Quadrangle(13, 14, 15, 16, 0),
-    gsSP1Quadrangle(14, 13, 17, 18, 0),
-    gsSP1Quadrangle(19, 20, 21, 22, 0),
-    gsSP1Quadrangle(22, 21, 23, 24, 0),
-    gsSP1Quadrangle(25, 26, 27, 28, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 3, 5, 0, 4, 5, 6, 0),
+    gsSP2Triangles(7, 8, 9, 0, 7, 9, 10, 0),
+    gsSP2Triangles(10, 9, 11, 0, 10, 11, 12, 0),
+    gsSP2Triangles(13, 14, 15, 0, 13, 15, 16, 0),
+    gsSP2Triangles(14, 13, 17, 0, 14, 17, 18, 0),
+    gsSP2Triangles(19, 20, 21, 0, 19, 21, 22, 0),
+    gsSP2Triangles(22, 21, 23, 0, 22, 23, 24, 0),
+    gsSP2Triangles(25, 26, 27, 0, 25, 27, 28, 0),
     gsSP1Triangle(29, 30, 31, 0),
     gsSPVertex(0x04010600, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
@@ -3779,16 +3779,16 @@ Gfx d_course_banshee_boardwalk_packed_dl_6098[] =
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(3, 5, 6, 0, 6, 5, 7, 0),
     gsSP2Triangles(6, 7, 8, 0, 9, 10, 11, 0),
-    gsSP1Quadrangle(9, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(15, 14, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(9, 11, 12, 0, 9, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(15, 14, 18, 0, 15, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSP2Triangles(24, 27, 28, 0, 8, 7, 29, 0),
     gsSP2Triangles(8, 29, 30, 0, 30, 29, 31, 0),
     gsSPVertex(0x04010A00, 31, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(3, 5, 6, 7, 0),
+    gsSP2Triangles(3, 5, 6, 0, 3, 6, 7, 0),
     gsSP2Triangles(3, 7, 8, 0, 9, 10, 11, 0),
     gsSP2Triangles(9, 11, 12, 0, 13, 14, 15, 0),
     gsSP2Triangles(13, 15, 16, 0, 17, 18, 19, 0),
@@ -3797,18 +3797,18 @@ Gfx d_course_banshee_boardwalk_packed_dl_6098[] =
     gsSP2Triangles(25, 27, 28, 0, 28, 27, 29, 0),
     gsSP1Triangle(28, 29, 30, 0),
     gsSPVertex(0x04010BF0, 14, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(9, 8, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 7, 6, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(9, 8, 10, 0, 9, 10, 11, 0),
+    gsSP2Triangles(12, 13, 7, 0, 12, 7, 6, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05005800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04010CD0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3830,14 +3830,14 @@ Gfx d_course_banshee_boardwalk_packed_dl_6320[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04010D10, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3853,14 +3853,14 @@ Gfx d_course_banshee_boardwalk_packed_dl_63B8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04010F10, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3876,14 +3876,14 @@ Gfx d_course_banshee_boardwalk_packed_dl_6450[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04011110, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3899,14 +3899,14 @@ Gfx d_course_banshee_boardwalk_packed_dl_64E8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04011310, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3922,19 +3922,19 @@ Gfx d_course_banshee_boardwalk_packed_dl_6580[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04011510, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04011710, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3950,14 +3950,14 @@ Gfx d_course_banshee_boardwalk_packed_dl_6640[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04011810, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3973,14 +3973,14 @@ Gfx d_course_banshee_boardwalk_packed_dl_66D8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04011A10, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3996,14 +3996,14 @@ Gfx d_course_banshee_boardwalk_packed_dl_6770[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04011C10, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4019,14 +4019,14 @@ Gfx d_course_banshee_boardwalk_packed_dl_6808[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04011E10, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4042,10 +4042,10 @@ Gfx d_course_banshee_boardwalk_packed_dl_68A0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04012010, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4061,14 +4061,14 @@ Gfx d_course_banshee_boardwalk_packed_dl_6918[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04012110, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4100,10 +4100,10 @@ Gfx d_course_banshee_boardwalk_packed_dl_6A10[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04012310, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4119,10 +4119,10 @@ Gfx d_course_banshee_boardwalk_packed_dl_6A88[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04012410, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4138,10 +4138,10 @@ Gfx d_course_banshee_boardwalk_packed_dl_6B00[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04012510, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4157,10 +4157,10 @@ Gfx d_course_banshee_boardwalk_packed_dl_6B78[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04012610, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4176,10 +4176,10 @@ Gfx d_course_banshee_boardwalk_packed_dl_6BF0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04012710, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4195,14 +4195,14 @@ Gfx d_course_banshee_boardwalk_packed_dl_6C68[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04012810, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4218,10 +4218,10 @@ Gfx d_course_banshee_boardwalk_packed_dl_6D00[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04012A10, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4237,10 +4237,10 @@ Gfx d_course_banshee_boardwalk_packed_dl_6D78[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04012B10, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4256,10 +4256,10 @@ Gfx d_course_banshee_boardwalk_packed_dl_6DF0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04012C10, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4275,10 +4275,10 @@ Gfx d_course_banshee_boardwalk_packed_dl_6E68[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04012D10, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4294,10 +4294,10 @@ Gfx d_course_banshee_boardwalk_packed_dl_6EE0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04012E10, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4313,10 +4313,10 @@ Gfx d_course_banshee_boardwalk_packed_dl_6F58[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04012F10, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4332,10 +4332,10 @@ Gfx d_course_banshee_boardwalk_packed_dl_6FD0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04013010, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4351,10 +4351,10 @@ Gfx d_course_banshee_boardwalk_packed_dl_7048[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04013110, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4370,10 +4370,10 @@ Gfx d_course_banshee_boardwalk_packed_dl_70C0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04013210, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4389,10 +4389,10 @@ Gfx d_course_banshee_boardwalk_packed_dl_7138[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04013310, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4408,10 +4408,10 @@ Gfx d_course_banshee_boardwalk_packed_dl_71B0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04013410, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
diff --git a/courses/special_cup/dks_jungle_parkway/course_data.inc.c b/courses/special_cup/dks_jungle_parkway/course_data.inc.c
index 58c7312c7..0bb07396b 100644
--- a/courses/special_cup/dks_jungle_parkway/course_data.inc.c
+++ b/courses/special_cup/dks_jungle_parkway/course_data.inc.c
@@ -5340,16 +5340,16 @@ Gfx d_course_dks_jungle_parkway_dl_DE48[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPSetGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_dks_jungle_parkway_paddle_boat_model1, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(d_course_dks_jungle_parkway_paddle_boat_model2, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5371,19 +5371,19 @@ Gfx d_course_dks_jungle_parkway_dl_DF30[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPSetGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_dks_jungle_parkway_paddle_boat_model3, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(9, 8, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(9, 8, 14, 0, 9, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(d_course_dks_jungle_parkway_paddle_boat_model4, 10, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(6, 8, 9, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(6, 8, 9, 0, 6, 9, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5425,12 +5425,12 @@ Gfx d_course_dks_jungle_parkway_dl_E068[] =
     gsSPSetGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_dks_jungle_parkway_paddle_boat_model5, 18, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
-    gsSP1Quadrangle(0, 2, 4, 5, 0),
-    gsSP1Quadrangle(3, 6, 7, 1, 0),
+    gsSP2Triangles(0, 2, 4, 0, 0, 4, 5, 0),
+    gsSP2Triangles(3, 6, 7, 0, 3, 7, 1, 0),
     gsSP2Triangles(2, 8, 4, 0, 8, 9, 4, 0),
-    gsSP1Quadrangle(10, 11, 9, 12, 0),
-    gsSP1Quadrangle(13, 6, 11, 14, 0),
-    gsSP1Quadrangle(13, 14, 15, 14, 0),
+    gsSP2Triangles(10, 11, 9, 0, 10, 9, 12, 0),
+    gsSP2Triangles(13, 6, 11, 0, 13, 11, 14, 0),
+    gsSP2Triangles(13, 14, 15, 0, 13, 15, 14, 0),
     gsSP2Triangles(13, 14, 13, 0, 6, 6, 11, 0),
     gsSP2Triangles(6, 11, 11, 0, 6, 16, 17, 0),
     gsSP1Triangle(6, 17, 11, 0),
@@ -5455,10 +5455,10 @@ Gfx d_course_dks_jungle_parkway_dl_E150[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPSetGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_dks_jungle_parkway_paddle_boat_model6, 21, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 0, 3, 0, 5, 1, 0, 0),
-    gsSP1Quadrangle(5, 6, 7, 1, 0),
-    gsSP1Quadrangle(3, 8, 9, 10, 0),
+    gsSP2Triangles(5, 6, 7, 0, 5, 7, 1, 0),
+    gsSP2Triangles(3, 8, 9, 0, 3, 9, 10, 0),
     gsSP2Triangles(10, 4, 3, 0, 11, 12, 9, 0),
     gsSP2Triangles(8, 11, 9, 0, 10, 13, 4, 0),
     gsSP2Triangles(10, 4, 14, 0, 15, 16, 17, 0),
@@ -5494,10 +5494,10 @@ Gfx d_course_dks_jungle_parkway_dl_E250[] =
     gsSPSetGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_dks_jungle_parkway_paddle_boat_model7, 20, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5516,18 +5516,18 @@ Gfx d_course_dks_jungle_parkway_dl_E320[] =
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPSetGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_dks_jungle_parkway_paddle_boat_model8, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 5, 4, 0),
-    gsSP1Quadrangle(7, 6, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 5, 0, 8, 5, 4, 0),
+    gsSP2Triangles(7, 6, 10, 0, 7, 10, 11, 0),
     gsSPLight(&d_course_dks_jungle_parkway_unknown_light3.l, 1),
     gsSPLight(&d_course_dks_jungle_parkway_unknown_light3.a, 2),
     gsSPVertex(d_course_dks_jungle_parkway_paddle_boat_model9, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 1, 4, 5, 0),
-    gsSP1Quadrangle(3, 2, 5, 6, 0),
-    gsSP1Quadrangle(7, 4, 1, 0, 0),
-    gsSP1Quadrangle(5, 4, 8, 9, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 1, 4, 0, 2, 4, 5, 0),
+    gsSP2Triangles(3, 2, 5, 0, 3, 5, 6, 0),
+    gsSP2Triangles(7, 4, 1, 0, 7, 1, 0, 0),
+    gsSP2Triangles(5, 4, 8, 0, 5, 8, 9, 0),
     gsSP2Triangles(5, 9, 10, 0, 11, 8, 4, 0),
     gsSP2Triangles(11, 4, 7, 0, 6, 5, 10, 0),
     gsSP2Triangles(6, 10, 12, 0, 12, 13, 9, 0),
@@ -5550,14 +5550,14 @@ Gfx d_course_dks_jungle_parkway_dl_E320[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPVertex(d_course_dks_jungle_parkway_paddle_boat_model10, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 6, G_TX_NOLOD, G_TX_MIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x00FC),
@@ -5568,8 +5568,8 @@ Gfx d_course_dks_jungle_parkway_dl_E320[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPVertex(d_course_dks_jungle_parkway_paddle_boat_model11, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 6, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x007C),
@@ -5579,8 +5579,8 @@ Gfx d_course_dks_jungle_parkway_dl_E320[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(d_course_dks_jungle_parkway_paddle_boat_model12, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5599,14 +5599,14 @@ Gfx d_course_dks_jungle_parkway_dl_E588[] =
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPSetGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_dks_jungle_parkway_paddle_boat_model13, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 1, 0, 0),
-    gsSP1Quadrangle(3, 2, 6, 7, 0),
-    gsSP1Quadrangle(7, 6, 5, 4, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 9, 8, 0),
-    gsSP1Quadrangle(11, 10, 14, 15, 0),
-    gsSP1Quadrangle(15, 14, 13, 12, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0),
+    gsSP2Triangles(3, 2, 6, 0, 3, 6, 7, 0),
+    gsSP2Triangles(7, 6, 5, 0, 7, 5, 4, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 9, 0, 12, 9, 8, 0),
+    gsSP2Triangles(11, 10, 14, 0, 11, 14, 15, 0),
+    gsSP2Triangles(15, 14, 13, 0, 15, 13, 12, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5625,8 +5625,8 @@ Gfx d_course_dks_jungle_parkway_dl_E628[] =
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPSetGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_dks_jungle_parkway_paddle_boat_model14, 7, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 1, 5, 6, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 1, 5, 0, 4, 5, 6, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5639,8 +5639,8 @@ Gfx d_course_dks_jungle_parkway_dl_E688[] =
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPSetGeometryMode(G_LIGHTING),
     gsSPVertex(d_course_dks_jungle_parkway_paddle_boat_model15, 7, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 2, 6, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 2, 0, 4, 2, 6, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5761,14 +5761,14 @@ Gfx d_course_dks_jungle_parkway_dl_FAE0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(d_course_dks_jungle_parkway_paddle_boat_paddle_model1, 21, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 2, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 8, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 9, 0),
-    gsSP1Quadrangle(15, 16, 8, 9, 0),
-    gsSP1Quadrangle(17, 18, 8, 9, 0),
-    gsSP1Quadrangle(19, 20, 8, 9, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 2, 0, 4, 2, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 8, 0, 10, 8, 9, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 9, 0),
+    gsSP2Triangles(15, 16, 8, 0, 15, 8, 9, 0),
+    gsSP2Triangles(17, 18, 8, 0, 17, 8, 9, 0),
+    gsSP2Triangles(19, 20, 8, 0, 19, 8, 9, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, d_course_dks_jungle_parkway_boat_paddle2),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
@@ -5842,13 +5842,13 @@ Gfx d_course_dks_jungle_parkway_dl_tree1[] =
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, d_course_dks_jungle_parkway_tree2_trunk),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5888,13 +5888,13 @@ Gfx d_course_dks_jungle_parkway_dl_tree2[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(d_course_dks_jungle_parkway_tree2_model, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, d_course_dks_jungle_parkway_tree3),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5932,13 +5932,13 @@ Gfx d_course_dks_jungle_parkway_dl_tree3[] =
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, d_course_dks_jungle_parkway_tree5),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5995,15 +5995,15 @@ Gfx d_course_dks_jungle_parkway_dl_palm_tree[] =
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, d_course_dks_jungle_parkway_tree_trunk),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPSetGeometryMode(G_CULL_BACK),
     gsSPEndDisplayList(),
 };
@@ -6031,7 +6031,7 @@ Gfx d_course_dks_jungle_parkway_dl_kiwano_fruit[] =
     gsDPSetTextureLUT(G_TT_RGBA16),
     gsDPLoadTLUT_pal256(d_course_dks_jungle_parkway_kiwano_tlut),
     gsSPVertex(d_course_dks_jungle_parkway_kiwano_model, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPEndDisplayList(),
 };
diff --git a/courses/special_cup/dks_jungle_parkway/packed.inc.c b/courses/special_cup/dks_jungle_parkway/packed.inc.c
index e3fe47ed5..ae4305d4d 100644
--- a/courses/special_cup/dks_jungle_parkway/packed.inc.c
+++ b/courses/special_cup/dks_jungle_parkway/packed.inc.c
@@ -18,59 +18,59 @@ Gfx d_course_dks_jungle_parkway_packed_dl_0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04000000, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05009000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04000100, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500A000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04000180, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500B000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04000200, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500C000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04000240, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500D000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x040002C0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500E000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04000340, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -86,46 +86,46 @@ Gfx d_course_dks_jungle_parkway_packed_dl_200[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04000440, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05009000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04000500, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500A000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04000540, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500C000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04000580, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500D000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x040005C0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500E000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04000600, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -141,44 +141,44 @@ Gfx d_course_dks_jungle_parkway_packed_dl_398[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x040006C0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05009000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04000740, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500A000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04000780, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500C000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x040007C0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500D000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04000800, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500E000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04000840, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -194,48 +194,48 @@ Gfx d_course_dks_jungle_parkway_packed_dl_520[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x040008C0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05009000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04000980, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500A000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04000A00, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500C000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04000A40, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500D000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04000AC0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500E000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04000B00, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -251,30 +251,30 @@ Gfx d_course_dks_jungle_parkway_packed_dl_6C8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04000BC0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500A000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04000C40, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500D000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04000C80, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500E000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04000CC0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -290,34 +290,34 @@ Gfx d_course_dks_jungle_parkway_packed_dl_7E0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04000D40, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05009000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04000E00, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500C000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04000E80, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500E000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04000F00, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -333,32 +333,32 @@ Gfx d_course_dks_jungle_parkway_packed_dl_918[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04000FC0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05009000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04001040, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500C000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x040010C0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500E000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04001140, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -374,32 +374,32 @@ Gfx d_course_dks_jungle_parkway_packed_dl_A40[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x040011C0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05009000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04001240, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500C000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x040012C0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500E000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04001340, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -415,32 +415,32 @@ Gfx d_course_dks_jungle_parkway_packed_dl_B68[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x040013C0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05009000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04001440, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500C000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x040014C0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500E000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04001540, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -456,66 +456,66 @@ Gfx d_course_dks_jungle_parkway_packed_dl_C90[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x040015C0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05008000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04001640, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05009000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04001780, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500A000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04001840, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500C000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04001900, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500D000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x040019C0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500E000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04001A80, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -531,28 +531,28 @@ Gfx d_course_dks_jungle_parkway_packed_dl_EC8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04001BC0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05009000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04001C00, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500C000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04001C40, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500E000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04001C80, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -568,36 +568,36 @@ Gfx d_course_dks_jungle_parkway_packed_dl_FD0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04001CC0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05009000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04001D80, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500C000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04001E40, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500E000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04001F00, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -613,45 +613,45 @@ Gfx d_course_dks_jungle_parkway_packed_dl_1118[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04001FC0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05009000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04002040, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500A000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04002080, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500C000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04002100, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500D000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04002140, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500E000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04002180, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -667,44 +667,44 @@ Gfx d_course_dks_jungle_parkway_packed_dl_12A8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04002200, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05009000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04002280, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500A000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x040022C0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500C000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04002300, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500D000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04002340, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500E000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04002380, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -720,43 +720,43 @@ Gfx d_course_dks_jungle_parkway_packed_dl_1430[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04002400, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500A000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04002540, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500D000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04002640, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500E000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04002780, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -772,63 +772,63 @@ Gfx d_course_dks_jungle_parkway_packed_dl_15B0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x040028C0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05008000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04002900, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05009000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04002A40, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500A000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04002B00, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500C000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04002B80, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500D000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04002C40, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500E000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04002CC0, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -844,47 +844,47 @@ Gfx d_course_dks_jungle_parkway_packed_dl_17D0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04002E00, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05009000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04002EC0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500A000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04002F00, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500C000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04002F40, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500D000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04002F80, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500E000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04003000, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -900,52 +900,52 @@ Gfx d_course_dks_jungle_parkway_packed_dl_1970[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x040030C0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05008000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04003100, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05009000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04003180, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500A000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x040031C0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500C000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04003240, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500D000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04003280, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500E000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x040032C0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -961,39 +961,39 @@ Gfx d_course_dks_jungle_parkway_packed_dl_1B38[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04003340, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05008000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04003380, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05009000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04003400, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500C000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04003480, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500E000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04003500, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1009,63 +1009,63 @@ Gfx d_course_dks_jungle_parkway_packed_dl_1C98[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04003580, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05009000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x040036C0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500A000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04003780, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500B000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04003800, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500C000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04003840, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500D000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04003900, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500E000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04003980, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1081,44 +1081,44 @@ Gfx d_course_dks_jungle_parkway_packed_dl_1EB8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04003AC0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05009000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04003B40, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500A000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04003B80, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500C000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04003BC0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500D000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04003C00, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500E000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04003C40, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1134,7 +1134,7 @@ Gfx d_course_dks_jungle_parkway_packed_dl_2040[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04003CC0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1150,7 +1150,7 @@ Gfx d_course_dks_jungle_parkway_packed_dl_20A0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04003D00, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1166,7 +1166,7 @@ Gfx d_course_dks_jungle_parkway_packed_dl_2100[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04003D40, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1182,7 +1182,7 @@ Gfx d_course_dks_jungle_parkway_packed_dl_2160[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04003D80, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1198,50 +1198,50 @@ Gfx d_course_dks_jungle_parkway_packed_dl_21C0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04003DC0, 7, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05008000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04003E30, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05009000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04003E70, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500A000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04003EB0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500C000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04003EF0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500D000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04003F30, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500E000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04003F70, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1257,10 +1257,10 @@ Gfx d_course_dks_jungle_parkway_packed_dl_2378[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04003FB0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1276,7 +1276,7 @@ Gfx d_course_dks_jungle_parkway_packed_dl_23F0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x040040B0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1292,7 +1292,7 @@ Gfx d_course_dks_jungle_parkway_packed_dl_2450[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x040040F0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1308,7 +1308,7 @@ Gfx d_course_dks_jungle_parkway_packed_dl_24B0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04004130, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1324,7 +1324,7 @@ Gfx d_course_dks_jungle_parkway_packed_dl_2510[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04004170, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1340,62 +1340,62 @@ Gfx d_course_dks_jungle_parkway_packed_dl_2570[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x040041B0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05008000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x040041F0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05009000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x040042B0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500A000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04004330, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500B000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04004370, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500C000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x040043B0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500D000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04004430, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500E000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04004470, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1411,28 +1411,28 @@ Gfx d_course_dks_jungle_parkway_packed_dl_2788[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04004530, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05009000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04004570, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500C000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x040045B0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500E000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x040045F0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1448,39 +1448,39 @@ Gfx d_course_dks_jungle_parkway_packed_dl_2890[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04004630, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05009000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04004690, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500B000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04004710, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500C000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04004750, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500E000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x040047D0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1496,44 +1496,44 @@ Gfx d_course_dks_jungle_parkway_packed_dl_29F0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04004850, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05009000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x040048D0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500A000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04004910, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500C000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04004950, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500D000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04004990, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500E000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x040049D0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1549,44 +1549,44 @@ Gfx d_course_dks_jungle_parkway_packed_dl_2B78[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04004A50, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05009000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04004AD0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500A000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04004B10, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500C000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04004B50, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500D000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04004B90, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500E000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04004BD0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1602,7 +1602,7 @@ Gfx d_course_dks_jungle_parkway_packed_dl_2D00[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04004C50, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1618,8 +1618,8 @@ Gfx d_course_dks_jungle_parkway_packed_dl_2D60[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04004C90, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1635,7 +1635,7 @@ Gfx d_course_dks_jungle_parkway_packed_dl_2DC8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04004D10, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1651,7 +1651,7 @@ Gfx d_course_dks_jungle_parkway_packed_dl_2E28[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04004D50, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1712,12 +1712,12 @@ Gfx d_course_dks_jungle_parkway_packed_dl_2FD0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04004D90, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1733,8 +1733,8 @@ Gfx d_course_dks_jungle_parkway_packed_dl_3058[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04004F10, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1750,9 +1750,9 @@ Gfx d_course_dks_jungle_parkway_packed_dl_30C0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04004F90, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1768,9 +1768,9 @@ Gfx d_course_dks_jungle_parkway_packed_dl_3130[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04005050, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1786,12 +1786,12 @@ Gfx d_course_dks_jungle_parkway_packed_dl_31A0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04005110, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1807,10 +1807,10 @@ Gfx d_course_dks_jungle_parkway_packed_dl_3228[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04005290, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1837,9 +1837,9 @@ Gfx d_course_dks_jungle_parkway_packed_dl_32D8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04005390, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1855,7 +1855,7 @@ Gfx d_course_dks_jungle_parkway_packed_dl_3348[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04005450, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1871,10 +1871,10 @@ Gfx d_course_dks_jungle_parkway_packed_dl_33A8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04005490, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1890,10 +1890,10 @@ Gfx d_course_dks_jungle_parkway_packed_dl_3420[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04005590, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1909,9 +1909,9 @@ Gfx d_course_dks_jungle_parkway_packed_dl_3498[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04005690, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1927,11 +1927,11 @@ Gfx d_course_dks_jungle_parkway_packed_dl_3508[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04005750, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1947,8 +1947,8 @@ Gfx d_course_dks_jungle_parkway_packed_dl_3588[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04005890, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1964,9 +1964,9 @@ Gfx d_course_dks_jungle_parkway_packed_dl_35F0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04005910, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1995,15 +1995,15 @@ Gfx d_course_dks_jungle_parkway_packed_dl_36A8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040059D0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 1, 0, 0),
-    gsSP1Quadrangle(5, 6, 7, 1, 0),
-    gsSP1Quadrangle(1, 7, 8, 2, 0),
-    gsSP1Quadrangle(9, 6, 10, 11, 0),
-    gsSP1Quadrangle(12, 7, 6, 9, 0),
-    gsSP1Quadrangle(7, 12, 13, 8, 0),
-    gsSP1Quadrangle(14, 10, 6, 5, 0),
-    gsSP1Quadrangle(15, 14, 5, 4, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0),
+    gsSP2Triangles(5, 6, 7, 0, 5, 7, 1, 0),
+    gsSP2Triangles(1, 7, 8, 0, 1, 8, 2, 0),
+    gsSP2Triangles(9, 6, 10, 0, 9, 10, 11, 0),
+    gsSP2Triangles(12, 7, 6, 0, 12, 6, 9, 0),
+    gsSP2Triangles(7, 12, 13, 0, 7, 13, 8, 0),
+    gsSP2Triangles(14, 10, 6, 0, 14, 6, 5, 0),
+    gsSP2Triangles(15, 14, 5, 0, 15, 5, 4, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2025,8 +2025,8 @@ Gfx d_course_dks_jungle_parkway_packed_dl_3758[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04005AD0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2042,73 +2042,73 @@ Gfx d_course_dks_jungle_parkway_packed_dl_37C0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04005B50, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04005D50, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04005F50, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04006150, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04006350, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04006550, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04006750, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04006950, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2131,12 +2131,12 @@ Gfx d_course_dks_jungle_parkway_packed_dl_3A48[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04006A50, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2176,9 +2176,9 @@ Gfx d_course_dks_jungle_parkway_packed_dl_3B28[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04006BD0, 18, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 0, 2, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 10, 9, 11, 0),
-    gsSP1Quadrangle(9, 12, 13, 11, 0),
+    gsSP2Triangles(9, 12, 13, 0, 9, 13, 11, 0),
     gsSP2Triangles(14, 15, 16, 0, 15, 17, 16, 0),
     gsSPEndDisplayList(),
 };
@@ -2196,14 +2196,14 @@ Gfx d_course_dks_jungle_parkway_packed_dl_3BA8[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04006CF0, 26, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 4, 0),
-    gsSP1Quadrangle(1, 4, 5, 6, 0),
-    gsSP1Quadrangle(1, 6, 7, 8, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 6, 0),
+    gsSP2Triangles(1, 6, 7, 0, 1, 7, 8, 0),
     gsSP2Triangles(1, 8, 2, 0, 9, 0, 2, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
     gsSP2Triangles(10, 13, 14, 0, 15, 12, 11, 0),
     gsSP2Triangles(16, 15, 11, 0, 17, 16, 11, 0),
     gsSP2Triangles(18, 17, 11, 0, 19, 20, 21, 0),
-    gsSP1Quadrangle(20, 22, 23, 21, 0),
+    gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0),
     gsSP2Triangles(24, 25, 4, 0, 3, 24, 4, 0),
     gsSPEndDisplayList(),
 };
@@ -2220,16 +2220,16 @@ Gfx d_course_dks_jungle_parkway_packed_dl_3C50[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04006E90, 29, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 0, 3, 5, 0),
-    gsSP1Quadrangle(3, 6, 7, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 0, 3, 0, 4, 3, 5, 0),
+    gsSP2Triangles(3, 6, 7, 0, 3, 7, 5, 0),
     gsSP2Triangles(4, 5, 8, 0, 4, 9, 10, 0),
     gsSP2Triangles(4, 11, 9, 0, 4, 8, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(13, 16, 17, 14, 0),
-    gsSP1Quadrangle(16, 18, 19, 17, 0),
-    gsSP1Quadrangle(20, 12, 15, 21, 0),
-    gsSP1Quadrangle(22, 20, 21, 23, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(13, 16, 17, 0, 13, 17, 14, 0),
+    gsSP2Triangles(16, 18, 19, 0, 16, 19, 17, 0),
+    gsSP2Triangles(20, 12, 15, 0, 20, 15, 21, 0),
+    gsSP2Triangles(22, 20, 21, 0, 22, 21, 23, 0),
     gsSP2Triangles(24, 25, 26, 0, 24, 27, 25, 0),
     gsSP1Triangle(27, 28, 25, 0),
     gsSPEndDisplayList(),
@@ -2247,8 +2247,8 @@ Gfx d_course_dks_jungle_parkway_packed_dl_3D08[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04007060, 25, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(0, 4, 5, 6, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(0, 4, 5, 0, 0, 5, 6, 0),
     gsSP2Triangles(0, 3, 4, 0, 7, 8, 9, 0),
     gsSP2Triangles(10, 7, 9, 0, 11, 12, 13, 0),
     gsSP2Triangles(11, 13, 14, 0, 12, 15, 16, 0),
@@ -2337,9 +2337,9 @@ Gfx d_course_dks_jungle_parkway_packed_dl_3F30[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04007390, 10, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
-    gsSP1Quadrangle(4, 2, 3, 5, 0),
+    gsSP2Triangles(4, 2, 3, 0, 4, 3, 5, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 6, 5, 0),
-    gsSP1Quadrangle(7, 5, 8, 9, 0),
+    gsSP2Triangles(7, 5, 8, 0, 7, 8, 9, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2371,10 +2371,10 @@ Gfx d_course_dks_jungle_parkway_packed_dl_3FD0[] =
     gsSP2Triangles(10, 12, 13, 0, 12, 10, 14, 0),
     gsSP2Triangles(10, 13, 11, 0, 10, 15, 14, 0),
     gsSP2Triangles(16, 17, 18, 0, 17, 19, 18, 0),
-    gsSP1Quadrangle(20, 18, 19, 21, 0),
-    gsSP1Quadrangle(21, 22, 23, 20, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 24, 27, 29, 0),
+    gsSP2Triangles(20, 18, 19, 0, 20, 19, 21, 0),
+    gsSP2Triangles(21, 22, 23, 0, 21, 23, 20, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 24, 27, 0, 28, 27, 29, 0),
     gsSP1Triangle(28, 29, 30, 0),
     gsSPVertex(0x04007620, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 1, 0),
@@ -2383,32 +2383,32 @@ Gfx d_course_dks_jungle_parkway_packed_dl_3FD0[] =
     gsSP2Triangles(0, 7, 3, 0, 2, 1, 8, 0),
     gsSP2Triangles(1, 9, 8, 0, 1, 4, 9, 0),
     gsSP2Triangles(2, 8, 10, 0, 11, 2, 10, 0),
-    gsSP1Quadrangle(11, 12, 5, 2, 0),
-    gsSP1Quadrangle(3, 7, 13, 14, 0),
-    gsSP1Quadrangle(14, 15, 4, 3, 0),
+    gsSP2Triangles(11, 12, 5, 0, 11, 5, 2, 0),
+    gsSP2Triangles(3, 7, 13, 0, 3, 13, 14, 0),
+    gsSP2Triangles(14, 15, 4, 0, 14, 4, 3, 0),
     gsSP2Triangles(4, 16, 9, 0, 4, 15, 16, 0),
-    gsSP1Quadrangle(17, 18, 15, 14, 0),
-    gsSP1Quadrangle(14, 13, 19, 17, 0),
+    gsSP2Triangles(17, 18, 15, 0, 17, 15, 14, 0),
+    gsSP2Triangles(14, 13, 19, 0, 14, 19, 17, 0),
     gsSP2Triangles(16, 15, 20, 0, 15, 18, 20, 0),
-    gsSP1Quadrangle(21, 22, 18, 17, 0),
-    gsSP1Quadrangle(17, 19, 23, 21, 0),
+    gsSP2Triangles(21, 22, 18, 0, 21, 18, 17, 0),
+    gsSP2Triangles(17, 19, 23, 0, 17, 23, 21, 0),
     gsSP2Triangles(18, 24, 20, 0, 18, 22, 24, 0),
-    gsSP1Quadrangle(25, 26, 22, 21, 0),
-    gsSP1Quadrangle(21, 23, 27, 25, 0),
+    gsSP2Triangles(25, 26, 22, 0, 25, 22, 21, 0),
+    gsSP2Triangles(21, 23, 27, 0, 21, 27, 25, 0),
     gsSP2Triangles(22, 28, 24, 0, 22, 26, 28, 0),
     gsSP1Triangle(29, 30, 31, 0),
     gsSPVertex(0x04007820, 31, 0),
     gsSP2Triangles(0, 1, 2, 0, 2, 3, 0, 0),
-    gsSP1Quadrangle(0, 3, 4, 5, 0),
+    gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0),
     gsSP2Triangles(0, 6, 7, 0, 1, 0, 7, 0),
     gsSP2Triangles(0, 5, 6, 0, 5, 8, 6, 0),
     gsSP2Triangles(9, 10, 11, 0, 12, 13, 14, 0),
     gsSP2Triangles(15, 1, 7, 0, 11, 16, 9, 0),
-    gsSP1Quadrangle(17, 18, 19, 20, 0),
+    gsSP2Triangles(17, 18, 19, 0, 17, 19, 20, 0),
     gsSP2Triangles(17, 20, 21, 0, 17, 22, 18, 0),
     gsSP2Triangles(17, 21, 22, 0, 22, 23, 24, 0),
     gsSP2Triangles(21, 23, 22, 0, 25, 24, 26, 0),
-    gsSP1Quadrangle(25, 26, 27, 28, 0),
+    gsSP2Triangles(25, 26, 27, 0, 25, 27, 28, 0),
     gsSP2Triangles(25, 28, 29, 0, 23, 26, 24, 0),
     gsSP2Triangles(23, 30, 26, 0, 26, 30, 27, 0),
     gsSP1Triangle(27, 30, 28, 0),
@@ -2417,8 +2417,8 @@ Gfx d_course_dks_jungle_parkway_packed_dl_3FD0[] =
     gsSP2Triangles(0, 4, 5, 0, 6, 0, 7, 0),
     gsSP2Triangles(8, 0, 5, 0, 0, 8, 7, 0),
     gsSP2Triangles(9, 0, 6, 0, 3, 0, 10, 0),
-    gsSP1Quadrangle(11, 12, 9, 6, 0),
-    gsSP1Quadrangle(13, 11, 6, 7, 0),
+    gsSP2Triangles(11, 12, 9, 0, 11, 9, 6, 0),
+    gsSP2Triangles(13, 11, 6, 0, 13, 6, 7, 0),
     gsSP2Triangles(3, 14, 1, 0, 4, 15, 16, 0),
     gsSP2Triangles(4, 16, 5, 0, 16, 17, 8, 0),
     gsSP2Triangles(16, 8, 5, 0, 8, 17, 13, 0),
@@ -2447,15 +2447,15 @@ Gfx d_course_dks_jungle_parkway_packed_dl_4230[] =
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 4, 0),
     gsSP2Triangles(4, 2, 1, 0, 5, 6, 7, 0),
     gsSP2Triangles(5, 8, 6, 0, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 9, 11, 13, 0),
+    gsSP2Triangles(12, 9, 11, 0, 12, 11, 13, 0),
     gsSP2Triangles(14, 15, 16, 0, 17, 18, 19, 0),
-    gsSP1Quadrangle(13, 20, 21, 12, 0),
+    gsSP2Triangles(13, 20, 21, 0, 13, 21, 12, 0),
     gsSP2Triangles(14, 22, 15, 0, 14, 23, 22, 0),
     gsSP2Triangles(14, 24, 23, 0, 25, 26, 27, 0),
-    gsSP1Quadrangle(25, 28, 29, 26, 0),
+    gsSP2Triangles(25, 28, 29, 0, 25, 29, 26, 0),
     gsSP1Triangle(30, 25, 27, 0),
     gsSPVertex(0x04007DC0, 13, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(7, 9, 10, 0, 8, 11, 12, 0),
     gsSP1Triangle(8, 12, 9, 0),
@@ -2482,50 +2482,50 @@ Gfx d_course_dks_jungle_parkway_packed_dl_4300[] =
     gsSP2Triangles(12, 13, 0, 0, 9, 12, 0, 0),
     gsSP2Triangles(13, 14, 0, 0, 15, 16, 17, 0),
     gsSP2Triangles(15, 17, 18, 0, 16, 19, 17, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSP2Triangles(23, 24, 20, 0, 23, 25, 24, 0),
     gsSP2Triangles(26, 22, 21, 0, 16, 27, 19, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
-    gsSP1Quadrangle(23, 22, 29, 28, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
+    gsSP2Triangles(23, 22, 29, 0, 23, 29, 28, 0),
     gsSPVertex(0x04008090, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 1, 0, 0),
     gsSP2Triangles(0, 2, 4, 0, 5, 6, 7, 0),
     gsSP2Triangles(5, 8, 6, 0, 5, 9, 8, 0),
-    gsSP1Quadrangle(3, 8, 9, 10, 0),
+    gsSP2Triangles(3, 8, 9, 0, 3, 9, 10, 0),
     gsSP2Triangles(10, 11, 3, 0, 3, 11, 1, 0),
     gsSP2Triangles(5, 12, 9, 0, 9, 12, 10, 0),
     gsSP2Triangles(10, 12, 13, 0, 13, 14, 10, 0),
     gsSP2Triangles(10, 14, 11, 0, 5, 15, 12, 0),
-    gsSP1Quadrangle(12, 15, 16, 17, 0),
-    gsSP1Quadrangle(12, 17, 18, 13, 0),
+    gsSP2Triangles(12, 15, 16, 0, 12, 16, 17, 0),
+    gsSP2Triangles(12, 17, 18, 0, 12, 18, 13, 0),
     gsSP2Triangles(19, 13, 18, 0, 19, 20, 13, 0),
     gsSP2Triangles(13, 20, 14, 0, 21, 18, 17, 0),
     gsSP2Triangles(18, 21, 19, 0, 22, 23, 24, 0),
     gsSP2Triangles(22, 24, 25, 0, 25, 26, 22, 0),
     gsSP2Triangles(15, 23, 22, 0, 22, 16, 15, 0),
-    gsSP1Quadrangle(22, 26, 27, 16, 0),
-    gsSP1Quadrangle(16, 27, 28, 17, 0),
+    gsSP2Triangles(22, 26, 27, 0, 22, 27, 16, 0),
+    gsSP2Triangles(16, 27, 28, 0, 16, 28, 17, 0),
     gsSP2Triangles(17, 28, 21, 0, 23, 5, 24, 0),
     gsSP2Triangles(23, 15, 5, 0, 29, 30, 31, 0),
     gsSPVertex(0x04008290, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 1, 0, 0),
-    gsSP1Quadrangle(3, 4, 5, 1, 0),
+    gsSP2Triangles(3, 4, 5, 0, 3, 5, 1, 0),
     gsSP2Triangles(6, 7, 8, 0, 7, 3, 8, 0),
-    gsSP1Quadrangle(7, 9, 4, 3, 0),
+    gsSP2Triangles(7, 9, 4, 0, 7, 4, 3, 0),
     gsSP2Triangles(10, 11, 12, 0, 13, 14, 10, 0),
     gsSP2Triangles(11, 10, 14, 0, 10, 12, 15, 0),
     gsSP2Triangles(10, 16, 13, 0, 10, 15, 17, 0),
     gsSP2Triangles(17, 18, 16, 0, 10, 17, 16, 0),
-    gsSP1Quadrangle(19, 20, 21, 22, 0),
+    gsSP2Triangles(19, 20, 21, 0, 19, 21, 22, 0),
     gsSP2Triangles(20, 23, 21, 0, 24, 23, 20, 0),
-    gsSP1Quadrangle(9, 25, 26, 4, 0),
-    gsSP1Quadrangle(4, 26, 27, 5, 0),
-    gsSP1Quadrangle(15, 12, 20, 19, 0),
+    gsSP2Triangles(9, 25, 26, 0, 9, 26, 4, 0),
+    gsSP2Triangles(4, 26, 27, 0, 4, 27, 5, 0),
+    gsSP2Triangles(15, 12, 20, 0, 15, 20, 19, 0),
     gsSP2Triangles(12, 24, 20, 0, 28, 7, 6, 0),
-    gsSP1Quadrangle(28, 29, 9, 7, 0),
+    gsSP2Triangles(28, 29, 9, 0, 28, 9, 7, 0),
     gsSP2Triangles(30, 28, 6, 0, 31, 28, 30, 0),
     gsSPVertex(0x04008490, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 5, 4, 7, 0),
     gsSP2Triangles(5, 0, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(7, 9, 5, 0, 5, 9, 1, 0),
@@ -2553,12 +2553,12 @@ Gfx d_course_dks_jungle_parkway_packed_dl_4548[] =
     gsSPVertex(0x04008610, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 0, 2, 0),
     gsSP2Triangles(0, 4, 1, 0, 1, 5, 2, 0),
-    gsSP1Quadrangle(1, 4, 6, 5, 0),
+    gsSP2Triangles(1, 4, 6, 0, 1, 6, 5, 0),
     gsSP2Triangles(3, 2, 7, 0, 2, 8, 7, 0),
     gsSP2Triangles(5, 9, 2, 0, 2, 10, 8, 0),
     gsSP2Triangles(2, 9, 10, 0, 5, 6, 9, 0),
     gsSP2Triangles(10, 9, 11, 0, 12, 9, 6, 0),
-    gsSP1Quadrangle(9, 13, 14, 15, 0),
+    gsSP2Triangles(9, 13, 14, 0, 9, 14, 15, 0),
     gsSP2Triangles(9, 15, 11, 0, 9, 12, 16, 0),
     gsSP2Triangles(9, 16, 13, 0, 8, 10, 17, 0),
     gsSP2Triangles(10, 18, 17, 0, 10, 11, 18, 0),
@@ -2567,7 +2567,7 @@ Gfx d_course_dks_jungle_parkway_packed_dl_4548[] =
     gsSP2Triangles(22, 6, 4, 0, 6, 22, 23, 0),
     gsSP2Triangles(24, 7, 19, 0, 19, 25, 24, 0),
     gsSP2Triangles(7, 24, 21, 0, 20, 26, 19, 0),
-    gsSP1Quadrangle(19, 26, 27, 25, 0),
+    gsSP2Triangles(19, 26, 27, 0, 19, 27, 25, 0),
     gsSP2Triangles(28, 29, 30, 0, 31, 29, 28, 0),
     gsSPVertex(0x04008810, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
@@ -2575,15 +2575,15 @@ Gfx d_course_dks_jungle_parkway_packed_dl_4548[] =
     gsSP2Triangles(7, 4, 3, 0, 4, 9, 10, 0),
     gsSP2Triangles(8, 9, 4, 0, 4, 10, 5, 0),
     gsSP2Triangles(10, 11, 5, 0, 5, 11, 12, 0),
-    gsSP1Quadrangle(6, 5, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 8, 7, 0),
+    gsSP2Triangles(6, 5, 12, 0, 6, 12, 13, 0),
+    gsSP2Triangles(14, 15, 8, 0, 14, 8, 7, 0),
     gsSP2Triangles(16, 9, 8, 0, 15, 16, 8, 0),
     gsSP2Triangles(17, 16, 15, 0, 18, 19, 20, 0),
     gsSP2Triangles(18, 20, 21, 0, 22, 23, 19, 0),
     gsSP2Triangles(22, 19, 18, 0, 24, 25, 19, 0),
     gsSP2Triangles(19, 25, 20, 0, 23, 24, 19, 0),
     gsSP2Triangles(11, 26, 12, 0, 12, 26, 27, 0),
-    gsSP1Quadrangle(13, 12, 27, 28, 0),
+    gsSP2Triangles(13, 12, 27, 0, 13, 27, 28, 0),
     gsSP2Triangles(29, 30, 31, 0, 28, 30, 29, 0),
     gsSP1Triangle(28, 27, 30, 0),
     gsSPVertex(0x04008A10, 30, 0),
@@ -2601,7 +2601,7 @@ Gfx d_course_dks_jungle_parkway_packed_dl_4548[] =
     gsSP1Triangle(21, 29, 26, 0),
     gsSPVertex(0x04008BF0, 19, 0),
     gsSP2Triangles(0, 1, 2, 0, 2, 3, 0, 0),
-    gsSP1Quadrangle(0, 3, 4, 5, 0),
+    gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0),
     gsSP2Triangles(2, 6, 3, 0, 7, 8, 9, 0),
     gsSP2Triangles(7, 9, 10, 0, 11, 12, 13, 0),
     gsSP2Triangles(11, 13, 14, 0, 10, 9, 12, 0),
@@ -2631,21 +2631,21 @@ Gfx d_course_dks_jungle_parkway_packed_dl_4788[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04008D20, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 0, 3, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 6, 9, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 0, 3, 0, 4, 3, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 6, 9, 0, 10, 9, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 12, 15, 13, 0),
-    gsSP1Quadrangle(16, 12, 14, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(19, 22, 23, 20, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 24, 27, 29, 0),
+    gsSP2Triangles(16, 12, 14, 0, 16, 14, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(19, 22, 23, 0, 19, 23, 20, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 24, 27, 0, 28, 27, 29, 0),
     gsSPVertex(0x04008F00, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 0, 3, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 6, 9, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 0, 3, 0, 4, 3, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 6, 9, 0, 10, 9, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2661,25 +2661,25 @@ Gfx d_course_dks_jungle_parkway_packed_dl_4858[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04008FC0, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(7, 10, 11, 8, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(14, 16, 17, 15, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(19, 22, 23, 20, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(25, 28, 29, 26, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(7, 10, 11, 0, 7, 11, 8, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(14, 16, 17, 0, 14, 17, 15, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(19, 22, 23, 0, 19, 23, 20, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(25, 28, 29, 0, 25, 29, 26, 0),
     gsSPVertex(0x040091A0, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(1, 4, 2, 0, 4, 5, 2, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(8, 10, 11, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(14, 16, 17, 15, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(20, 22, 23, 21, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(14, 16, 17, 0, 14, 17, 15, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2695,19 +2695,19 @@ Gfx d_course_dks_jungle_parkway_packed_dl_4948[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04009320, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(7, 10, 11, 8, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(13, 16, 17, 14, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 18, 21, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(25, 28, 29, 26, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(7, 10, 11, 0, 7, 11, 8, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(13, 16, 17, 0, 13, 17, 14, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 18, 21, 0, 22, 21, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(25, 28, 29, 0, 25, 29, 26, 0),
     gsSPVertex(0x04009500, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2723,14 +2723,14 @@ Gfx d_course_dks_jungle_parkway_packed_dl_4A08[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04009560, 27, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 6, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 12, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 6, 0, 10, 6, 9, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 12, 0, 16, 12, 15, 0),
     gsSP2Triangles(18, 19, 20, 0, 21, 18, 20, 0),
-    gsSP1Quadrangle(18, 22, 23, 24, 0),
+    gsSP2Triangles(18, 22, 23, 0, 18, 23, 24, 0),
     gsSP2Triangles(18, 24, 19, 0, 25, 26, 19, 0),
     gsSP2Triangles(25, 19, 24, 0, 23, 25, 24, 0),
     gsSPEndDisplayList(),
@@ -2748,23 +2748,23 @@ Gfx d_course_dks_jungle_parkway_packed_dl_4AB0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04009710, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 6, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 12, 15, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(20, 22, 23, 21, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(26, 28, 29, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 6, 0, 10, 6, 9, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 12, 0, 16, 12, 15, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(26, 28, 29, 0, 26, 29, 27, 0),
     gsSPVertex(0x040098F0, 18, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 0, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(8, 10, 11, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(14, 16, 17, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 0, 0, 4, 0, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(14, 16, 17, 0, 14, 17, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2781,28 +2781,28 @@ Gfx d_course_dks_jungle_parkway_packed_dl_4B90[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04009A10, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
-    gsSP1Quadrangle(0, 4, 5, 3, 0),
-    gsSP1Quadrangle(0, 6, 7, 4, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(9, 12, 13, 10, 0),
+    gsSP2Triangles(0, 4, 5, 0, 0, 5, 3, 0),
+    gsSP2Triangles(0, 6, 7, 0, 0, 7, 4, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(9, 12, 13, 0, 9, 13, 10, 0),
     gsSP2Triangles(6, 14, 15, 0, 16, 7, 6, 0),
     gsSP2Triangles(16, 6, 17, 0, 6, 15, 17, 0),
-    gsSP1Quadrangle(0, 2, 14, 6, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(20, 22, 23, 21, 0),
-    gsSP1Quadrangle(21, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
-    gsSP1Quadrangle(28, 30, 31, 29, 0),
+    gsSP2Triangles(0, 2, 14, 0, 0, 14, 6, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0),
+    gsSP2Triangles(21, 23, 24, 0, 21, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
+    gsSP2Triangles(28, 30, 31, 0, 28, 31, 29, 0),
     gsSPVertex(0x04009C10, 25, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(8, 10, 11, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(17, 20, 21, 18, 0),
-    gsSP1Quadrangle(21, 22, 23, 18, 0),
-    gsSP1Quadrangle(18, 23, 24, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(17, 20, 21, 0, 17, 21, 18, 0),
+    gsSP2Triangles(21, 22, 23, 0, 21, 23, 18, 0),
+    gsSP2Triangles(18, 23, 24, 0, 18, 24, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2841,11 +2841,11 @@ Gfx d_course_dks_jungle_parkway_packed_dl_4D30[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04009ED0, 15, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
-    gsSP1Quadrangle(4, 5, 6, 2, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 2, 0),
     gsSP2Triangles(3, 4, 2, 0, 7, 5, 4, 0),
     gsSP2Triangles(8, 7, 4, 0, 3, 8, 4, 0),
-    gsSP1Quadrangle(9, 10, 11, 12, 0),
-    gsSP1Quadrangle(10, 13, 14, 11, 0),
+    gsSP2Triangles(9, 10, 11, 0, 9, 11, 12, 0),
+    gsSP2Triangles(10, 13, 14, 0, 10, 14, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2861,15 +2861,15 @@ Gfx d_course_dks_jungle_parkway_packed_dl_4DB8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04009FC0, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(1, 4, 2, 0, 4, 5, 2, 0),
     gsSP2Triangles(4, 6, 5, 0, 7, 8, 9, 0),
     gsSP2Triangles(8, 10, 9, 0, 11, 7, 9, 0),
     gsSP2Triangles(11, 9, 12, 0, 6, 13, 5, 0),
-    gsSP1Quadrangle(14, 15, 7, 11, 0),
-    gsSP1Quadrangle(15, 16, 8, 7, 0),
-    gsSP1Quadrangle(17, 14, 11, 18, 0),
-    gsSP1Quadrangle(18, 11, 12, 19, 0),
+    gsSP2Triangles(14, 15, 7, 0, 14, 7, 11, 0),
+    gsSP2Triangles(15, 16, 8, 0, 15, 8, 7, 0),
+    gsSP2Triangles(17, 14, 11, 0, 17, 11, 18, 0),
+    gsSP2Triangles(18, 11, 12, 0, 18, 12, 19, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 6, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x007C),
@@ -2879,9 +2879,9 @@ Gfx d_course_dks_jungle_parkway_packed_dl_4DB8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400A100, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2897,18 +2897,18 @@ Gfx d_course_dks_jungle_parkway_packed_dl_4EB8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x0400A1C0, 27, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 0, 3, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(6, 9, 4, 5, 0),
-    gsSP1Quadrangle(3, 10, 11, 5, 0),
-    gsSP1Quadrangle(10, 12, 13, 11, 0),
-    gsSP1Quadrangle(14, 15, 11, 13, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 0, 3, 0, 4, 3, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(6, 9, 4, 0, 6, 4, 5, 0),
+    gsSP2Triangles(3, 10, 11, 0, 3, 11, 5, 0),
+    gsSP2Triangles(10, 12, 13, 0, 10, 13, 11, 0),
+    gsSP2Triangles(14, 15, 11, 0, 14, 11, 13, 0),
     gsSP2Triangles(16, 5, 11, 0, 15, 16, 11, 0),
-    gsSP1Quadrangle(16, 17, 6, 5, 0),
+    gsSP2Triangles(16, 17, 6, 0, 16, 6, 5, 0),
     gsSP2Triangles(18, 19, 20, 0, 21, 18, 20, 0),
     gsSP2Triangles(21, 20, 22, 0, 23, 21, 22, 0),
-    gsSP1Quadrangle(24, 23, 22, 25, 0),
+    gsSP2Triangles(24, 23, 22, 0, 24, 22, 25, 0),
     gsSP2Triangles(7, 6, 2, 0, 26, 7, 2, 0),
     gsSP1Triangle(2, 1, 26, 0),
     gsDPTileSync(),
@@ -2920,10 +2920,10 @@ Gfx d_course_dks_jungle_parkway_packed_dl_4EB8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400A370, 14, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(0, 3, 4, 0, 5, 0, 4, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2939,18 +2939,18 @@ Gfx d_course_dks_jungle_parkway_packed_dl_4FE8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x0400A450, 22, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(0, 4, 5, 1, 0),
-    gsSP1Quadrangle(5, 4, 6, 7, 0),
-    gsSP1Quadrangle(5, 8, 9, 1, 0),
-    gsSP1Quadrangle(8, 5, 7, 10, 0),
-    gsSP1Quadrangle(1, 9, 11, 2, 0),
-    gsSP1Quadrangle(12, 10, 7, 13, 0),
-    gsSP1Quadrangle(7, 6, 14, 13, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(0, 4, 5, 0, 0, 5, 1, 0),
+    gsSP2Triangles(5, 4, 6, 0, 5, 6, 7, 0),
+    gsSP2Triangles(5, 8, 9, 0, 5, 9, 1, 0),
+    gsSP2Triangles(8, 5, 7, 0, 8, 7, 10, 0),
+    gsSP2Triangles(1, 9, 11, 0, 1, 11, 2, 0),
+    gsSP2Triangles(12, 10, 7, 0, 12, 7, 13, 0),
+    gsSP2Triangles(7, 6, 14, 0, 7, 14, 13, 0),
     gsSP2Triangles(15, 16, 17, 0, 18, 15, 17, 0),
     gsSP2Triangles(18, 19, 15, 0, 14, 17, 13, 0),
-    gsSP1Quadrangle(17, 20, 12, 13, 0),
-    gsSP1Quadrangle(21, 18, 2, 11, 0),
+    gsSP2Triangles(17, 20, 12, 0, 17, 12, 13, 0),
+    gsSP2Triangles(21, 18, 2, 0, 21, 2, 11, 0),
     gsSP1Triangle(18, 3, 2, 0),
     gsSPEndDisplayList(),
 };
@@ -2967,13 +2967,13 @@ Gfx d_course_dks_jungle_parkway_packed_dl_50A8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x0400A5B0, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 4, 5, 0, 0),
-    gsSP1Quadrangle(4, 6, 7, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 4, 5, 0, 3, 5, 0, 0),
+    gsSP2Triangles(4, 6, 7, 0, 4, 7, 5, 0),
     gsSP2Triangles(0, 8, 9, 0, 9, 10, 1, 0),
     gsSP2Triangles(9, 1, 0, 0, 0, 5, 8, 0),
-    gsSP1Quadrangle(11, 12, 13, 14, 0),
-    gsSP1Quadrangle(15, 11, 14, 16, 0),
+    gsSP2Triangles(11, 12, 13, 0, 11, 13, 14, 0),
+    gsSP2Triangles(15, 11, 14, 0, 15, 14, 16, 0),
     gsSP2Triangles(8, 12, 11, 0, 8, 17, 12, 0),
     gsSP2Triangles(9, 8, 11, 0, 5, 17, 8, 0),
     gsSP2Triangles(5, 7, 17, 0, 16, 18, 19, 0),
@@ -2988,10 +2988,10 @@ Gfx d_course_dks_jungle_parkway_packed_dl_50A8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400A6F0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3011,8 +3011,8 @@ Gfx d_course_dks_jungle_parkway_packed_dl_51C8[] =
     gsSP2Triangles(2, 1, 4, 0, 1, 5, 6, 0),
     gsSP2Triangles(1, 6, 4, 0, 7, 8, 0, 0),
     gsSP2Triangles(7, 0, 3, 0, 8, 1, 0, 0),
-    gsSP1Quadrangle(9, 10, 5, 1, 0),
-    gsSP1Quadrangle(1, 8, 11, 9, 0),
+    gsSP2Triangles(9, 10, 5, 0, 9, 5, 1, 0),
+    gsSP2Triangles(1, 8, 11, 0, 1, 11, 9, 0),
     gsSP2Triangles(12, 8, 7, 0, 8, 12, 13, 0),
     gsSP1Triangle(8, 13, 11, 0),
     gsDPTileSync(),
@@ -3025,8 +3025,8 @@ Gfx d_course_dks_jungle_parkway_packed_dl_51C8[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400A8D0, 12, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 2, 1, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3045,9 +3045,9 @@ Gfx d_course_dks_jungle_parkway_packed_dl_52C0[] =
     gsSP2Triangles(0, 1, 2, 0, 2, 1, 3, 0),
     gsSP2Triangles(2, 3, 4, 0, 1, 5, 6, 0),
     gsSP2Triangles(1, 6, 3, 0, 5, 1, 7, 0),
-    gsSP1Quadrangle(1, 0, 8, 7, 0),
-    gsSP1Quadrangle(9, 10, 11, 12, 0),
-    gsSP1Quadrangle(11, 13, 14, 12, 0),
+    gsSP2Triangles(1, 0, 8, 0, 1, 8, 7, 0),
+    gsSP2Triangles(9, 10, 11, 0, 9, 11, 12, 0),
+    gsSP2Triangles(11, 13, 14, 0, 11, 14, 12, 0),
     gsSP2Triangles(7, 15, 5, 0, 7, 16, 17, 0),
     gsSP2Triangles(7, 17, 15, 0, 7, 8, 16, 0),
     gsSP2Triangles(18, 15, 17, 0, 19, 15, 18, 0),
@@ -3064,12 +3064,12 @@ Gfx d_course_dks_jungle_parkway_packed_dl_52C0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400AB30, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 11, 8, 10, 0),
     gsSP2Triangles(12, 10, 13, 0, 12, 11, 10, 0),
     gsSP2Triangles(14, 15, 16, 0, 15, 17, 16, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
     gsSP2Triangles(22, 23, 24, 0, 22, 25, 23, 0),
     gsSP2Triangles(26, 27, 28, 0, 26, 29, 27, 0),
     gsSPVertex(0x0400AD10, 7, 0),
@@ -3090,18 +3090,18 @@ Gfx d_course_dks_jungle_parkway_packed_dl_5420[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x0400AD80, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 6, 0),
-    gsSP1Quadrangle(3, 2, 6, 7, 0),
-    gsSP1Quadrangle(1, 8, 4, 2, 0),
-    gsSP1Quadrangle(9, 4, 8, 10, 0),
-    gsSP1Quadrangle(4, 9, 11, 5, 0),
-    gsSP1Quadrangle(12, 13, 8, 1, 0),
-    gsSP1Quadrangle(10, 8, 13, 14, 0),
-    gsSP1Quadrangle(15, 0, 3, 16, 0),
-    gsSP1Quadrangle(16, 3, 7, 17, 0),
-    gsSP1Quadrangle(18, 12, 1, 0, 0),
-    gsSP1Quadrangle(19, 18, 0, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 6, 0),
+    gsSP2Triangles(3, 2, 6, 0, 3, 6, 7, 0),
+    gsSP2Triangles(1, 8, 4, 0, 1, 4, 2, 0),
+    gsSP2Triangles(9, 4, 8, 0, 9, 8, 10, 0),
+    gsSP2Triangles(4, 9, 11, 0, 4, 11, 5, 0),
+    gsSP2Triangles(12, 13, 8, 0, 12, 8, 1, 0),
+    gsSP2Triangles(10, 8, 13, 0, 10, 13, 14, 0),
+    gsSP2Triangles(15, 0, 3, 0, 15, 3, 16, 0),
+    gsSP2Triangles(16, 3, 7, 0, 16, 7, 17, 0),
+    gsSP2Triangles(18, 12, 1, 0, 18, 1, 0, 0),
+    gsSP2Triangles(19, 18, 0, 0, 19, 0, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3137,9 +3137,9 @@ Gfx d_course_dks_jungle_parkway_packed_dl_5558[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400AEC0, 11, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(3, 4, 0, 0, 0, 4, 5, 0),
-    gsSP1Quadrangle(1, 6, 7, 8, 0),
+    gsSP2Triangles(1, 6, 7, 0, 1, 7, 8, 0),
     gsSP2Triangles(1, 8, 2, 0, 9, 10, 6, 0),
     gsSP1Triangle(7, 6, 10, 0),
     gsSPEndDisplayList(),
@@ -3196,14 +3196,14 @@ Gfx d_course_dks_jungle_parkway_packed_dl_56B8[] =
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 0, 0),
     gsSP2Triangles(0, 2, 3, 0, 5, 6, 2, 0),
     gsSP2Triangles(2, 6, 7, 0, 2, 1, 5, 0),
-    gsSP1Quadrangle(3, 8, 9, 10, 0),
+    gsSP2Triangles(3, 8, 9, 0, 3, 9, 10, 0),
     gsSP2Triangles(11, 12, 3, 0, 3, 12, 4, 0),
     gsSP2Triangles(3, 13, 11, 0, 3, 10, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
     gsSP2Triangles(16, 18, 17, 0, 6, 19, 7, 0),
     gsSP2Triangles(19, 20, 7, 0, 20, 21, 7, 0),
     gsSP2Triangles(22, 23, 24, 0, 23, 25, 24, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3224,7 +3224,7 @@ Gfx d_course_dks_jungle_parkway_packed_dl_5768[] =
     gsSP2Triangles(2, 6, 0, 0, 7, 8, 0, 0),
     gsSP2Triangles(8, 9, 0, 0, 0, 9, 5, 0),
     gsSP2Triangles(6, 2, 10, 0, 11, 12, 6, 0),
-    gsSP1Quadrangle(6, 10, 13, 14, 0),
+    gsSP2Triangles(6, 10, 13, 0, 6, 13, 14, 0),
     gsSP2Triangles(6, 14, 11, 0, 12, 15, 16, 0),
     gsSP2Triangles(15, 12, 11, 0, 12, 16, 17, 0),
     gsSPEndDisplayList(),
@@ -3244,7 +3244,7 @@ Gfx d_course_dks_jungle_parkway_packed_dl_5800[] =
     gsSPVertex(0x0400B350, 16, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 0, 2, 0),
     gsSP2Triangles(1, 4, 2, 0, 5, 2, 6, 0),
-    gsSP1Quadrangle(2, 5, 7, 8, 0),
+    gsSP2Triangles(2, 5, 7, 0, 2, 7, 8, 0),
     gsSP2Triangles(2, 8, 9, 0, 9, 10, 2, 0),
     gsSP2Triangles(10, 3, 2, 0, 11, 12, 2, 0),
     gsSP2Triangles(13, 11, 2, 0, 14, 13, 2, 0),
@@ -3352,11 +3352,11 @@ Gfx d_course_dks_jungle_parkway_packed_dl_5AB0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400B6B0, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 3, 2, 0, 5, 4, 2, 0),
     gsSP2Triangles(6, 5, 2, 0, 7, 6, 2, 0),
-    gsSP1Quadrangle(8, 7, 2, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
+    gsSP2Triangles(8, 7, 2, 0, 8, 2, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
     gsSP2Triangles(12, 14, 15, 0, 13, 12, 15, 0),
     gsSP2Triangles(14, 12, 16, 0, 16, 12, 17, 0),
     gsSP2Triangles(17, 12, 18, 0, 18, 12, 19, 0),
@@ -3426,17 +3426,17 @@ Gfx d_course_dks_jungle_parkway_packed_dl_5C68[] =
     gsSP2Triangles(9, 10, 3, 0, 7, 9, 3, 0),
     gsSP2Triangles(10, 11, 3, 0, 3, 11, 8, 0),
     gsSP2Triangles(1, 12, 2, 0, 12, 1, 13, 0),
-    gsSP1Quadrangle(1, 8, 14, 15, 0),
+    gsSP2Triangles(1, 8, 14, 0, 1, 14, 15, 0),
     gsSP2Triangles(15, 16, 1, 0, 1, 16, 17, 0),
-    gsSP1Quadrangle(1, 17, 18, 19, 0),
-    gsSP1Quadrangle(1, 19, 20, 21, 0),
-    gsSP1Quadrangle(1, 21, 22, 23, 0),
+    gsSP2Triangles(1, 17, 18, 0, 1, 18, 19, 0),
+    gsSP2Triangles(1, 19, 20, 0, 1, 20, 21, 0),
+    gsSP2Triangles(1, 21, 22, 0, 1, 22, 23, 0),
     gsSP2Triangles(23, 24, 1, 0, 1, 24, 25, 0),
     gsSP2Triangles(25, 13, 1, 0, 12, 13, 26, 0),
     gsSP2Triangles(27, 28, 29, 0, 30, 26, 29, 0),
     gsSP2Triangles(31, 28, 27, 0, 29, 28, 30, 0),
     gsSPVertex(0x0400BC90, 13, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 1, 5, 0, 6, 2, 7, 0),
     gsSP2Triangles(8, 7, 9, 0, 7, 10, 6, 0),
     gsSP2Triangles(4, 5, 11, 0, 1, 4, 12, 0),
@@ -3458,7 +3458,7 @@ Gfx d_course_dks_jungle_parkway_packed_dl_5D68[] =
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
     gsSP2Triangles(4, 0, 2, 0, 5, 6, 2, 0),
     gsSP2Triangles(6, 4, 2, 0, 2, 7, 5, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 15, 16, 12, 0),
     gsSP2Triangles(17, 15, 12, 0, 12, 14, 17, 0),
     gsSPEndDisplayList(),
@@ -3476,7 +3476,7 @@ Gfx d_course_dks_jungle_parkway_packed_dl_5DF0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400BE80, 14, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 5, 7, 6, 0),
     gsSP2Triangles(8, 5, 4, 0, 7, 9, 6, 0),
     gsSP2Triangles(9, 10, 6, 0, 10, 11, 6, 0),
@@ -3559,7 +3559,7 @@ Gfx d_course_dks_jungle_parkway_packed_dl_6008[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400C1C0, 13, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(0, 3, 4, 0, 5, 0, 4, 0),
     gsSP2Triangles(5, 6, 0, 0, 6, 1, 0, 0),
     gsSP2Triangles(2, 7, 3, 0, 3, 8, 4, 0),
@@ -3626,9 +3626,9 @@ Gfx d_course_dks_jungle_parkway_packed_dl_61B0[] =
     gsSPVertex(0x0400C490, 17, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
     gsSP2Triangles(3, 4, 2, 0, 0, 2, 5, 0),
-    gsSP1Quadrangle(6, 0, 5, 7, 0),
+    gsSP2Triangles(6, 0, 5, 0, 6, 5, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 11, 9, 8, 0),
-    gsSP1Quadrangle(9, 6, 7, 10, 0),
+    gsSP2Triangles(9, 6, 7, 0, 9, 7, 10, 0),
     gsSP2Triangles(12, 13, 14, 0, 15, 14, 13, 0),
     gsSP1Triangle(16, 14, 15, 0),
     gsSPEndDisplayList(),
@@ -3646,7 +3646,7 @@ Gfx d_course_dks_jungle_parkway_packed_dl_6240[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400C5A0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(3, 4, 0, 0, 5, 2, 1, 0),
     gsSP2Triangles(3, 2, 6, 0, 7, 4, 3, 0),
     gsSP2Triangles(7, 3, 6, 0, 8, 9, 10, 0),
@@ -3657,7 +3657,7 @@ Gfx d_course_dks_jungle_parkway_packed_dl_6240[] =
     gsSP2Triangles(14, 11, 13, 0, 16, 17, 18, 0),
     gsSP2Triangles(16, 19, 17, 0, 17, 20, 18, 0),
     gsSP2Triangles(18, 20, 21, 0, 21, 20, 22, 0),
-    gsSP1Quadrangle(23, 16, 18, 21, 0),
+    gsSP2Triangles(23, 16, 18, 0, 23, 18, 21, 0),
     gsSP2Triangles(24, 23, 21, 0, 21, 22, 25, 0),
     gsSP2Triangles(24, 21, 26, 0, 27, 28, 24, 0),
     gsSP2Triangles(29, 27, 30, 0, 31, 27, 29, 0),
@@ -3776,9 +3776,9 @@ Gfx d_course_dks_jungle_parkway_packed_dl_65A8[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400CBF0, 10, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 2, 1, 0),
-    gsSP1Quadrangle(2, 3, 4, 5, 0),
+    gsSP2Triangles(2, 3, 4, 0, 2, 4, 5, 0),
     gsSP2Triangles(3, 6, 7, 0, 7, 4, 3, 0),
-    gsSP1Quadrangle(6, 3, 8, 9, 0),
+    gsSP2Triangles(6, 3, 8, 0, 6, 8, 9, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3930,9 +3930,9 @@ Gfx d_course_dks_jungle_parkway_packed_dl_69A0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400D010, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3972,7 +3972,7 @@ Gfx d_course_dks_jungle_parkway_packed_dl_6AA8[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400D2C0, 24, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
-    gsSP1Quadrangle(2, 3, 4, 5, 0),
+    gsSP2Triangles(2, 3, 4, 0, 2, 4, 5, 0),
     gsSP2Triangles(4, 6, 7, 0, 7, 5, 4, 0),
     gsSP2Triangles(8, 9, 10, 0, 8, 11, 9, 0),
     gsSP2Triangles(9, 12, 13, 0, 13, 10, 9, 0),
@@ -3999,7 +3999,7 @@ Gfx d_course_dks_jungle_parkway_packed_dl_6B48[] =
     gsSP2Triangles(1, 4, 2, 0, 5, 2, 6, 0),
     gsSP2Triangles(5, 7, 2, 0, 7, 8, 2, 0),
     gsSP2Triangles(8, 3, 2, 0, 4, 9, 2, 0),
-    gsSP1Quadrangle(10, 11, 9, 4, 0),
+    gsSP2Triangles(10, 11, 9, 0, 10, 9, 4, 0),
     gsSP1Triangle(12, 5, 6, 0),
     gsSPEndDisplayList(),
 };
@@ -4016,8 +4016,8 @@ Gfx d_course_dks_jungle_parkway_packed_dl_6BD0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400D510, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4033,7 +4033,7 @@ Gfx d_course_dks_jungle_parkway_packed_dl_6C38[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400D590, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4067,7 +4067,7 @@ Gfx d_course_dks_jungle_parkway_packed_dl_6D08[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400D690, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4101,8 +4101,8 @@ Gfx d_course_dks_jungle_parkway_packed_dl_6DD8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400D770, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4148,12 +4148,12 @@ Gfx d_course_dks_jungle_parkway_packed_dl_6F10[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400DA80, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 1, 0, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(9, 12, 13, 10, 0),
-    gsSP1Quadrangle(14, 8, 11, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 1, 0, 6, 1, 0, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(9, 12, 13, 0, 9, 13, 10, 0),
+    gsSP2Triangles(14, 8, 11, 0, 14, 11, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4195,9 +4195,9 @@ Gfx d_course_dks_jungle_parkway_packed_dl_7048[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400DD70, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 0, 0, 0, 3, 4, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsSP2Triangles(8, 10, 11, 0, 9, 8, 11, 0),
     gsSPEndDisplayList(),
 };
@@ -4241,7 +4241,7 @@ Gfx d_course_dks_jungle_parkway_packed_dl_7170[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400DFC0, 10, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
-    gsSP1Quadrangle(0, 4, 5, 3, 0),
+    gsSP2Triangles(0, 4, 5, 0, 0, 5, 3, 0),
     gsSP2Triangles(6, 4, 7, 0, 6, 5, 4, 0),
     gsSP2Triangles(6, 8, 5, 0, 3, 9, 1, 0),
     gsSPEndDisplayList(),
@@ -4287,13 +4287,13 @@ Gfx d_course_dks_jungle_parkway_packed_dl_72A8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400E280, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(3, 2, 4, 0, 4, 5, 3, 0),
     gsSP2Triangles(6, 7, 8, 0, 7, 9, 8, 0),
     gsSP2Triangles(7, 10, 9, 0, 11, 12, 13, 0),
     gsSP2Triangles(12, 14, 13, 0, 15, 13, 14, 0),
     gsSP2Triangles(16, 17, 18, 0, 17, 19, 18, 0),
-    gsSP1Quadrangle(19, 20, 21, 18, 0),
+    gsSP2Triangles(19, 20, 21, 0, 19, 21, 18, 0),
     gsSP2Triangles(5, 22, 23, 0, 5, 4, 22, 0),
     gsSP2Triangles(15, 24, 25, 0, 15, 26, 24, 0),
     gsSP2Triangles(26, 15, 14, 0, 21, 20, 27, 0),
@@ -4320,9 +4320,9 @@ Gfx d_course_dks_jungle_parkway_packed_dl_7390[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400E580, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
-    gsSP1Quadrangle(4, 6, 7, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
+    gsSP2Triangles(4, 6, 7, 0, 4, 7, 5, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4338,7 +4338,7 @@ Gfx d_course_dks_jungle_parkway_packed_dl_7400[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400E600, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(2, 4, 3, 0, 4, 5, 3, 0),
     gsSP2Triangles(6, 7, 8, 0, 8, 9, 10, 0),
     gsSP2Triangles(8, 10, 6, 0, 11, 7, 6, 0),
@@ -4385,28 +4385,28 @@ Gfx d_course_dks_jungle_parkway_packed_dl_7538[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400E740, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSP2Triangles(20, 21, 22, 0, 21, 23, 22, 0),
     gsSP2Triangles(21, 24, 23, 0, 24, 25, 23, 0),
-    gsSP1Quadrangle(24, 26, 27, 25, 0),
+    gsSP2Triangles(24, 26, 27, 0, 24, 27, 25, 0),
     gsSP2Triangles(28, 29, 30, 0, 31, 28, 30, 0),
     gsSPVertex(0x0400E940, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 8, 11, 13, 0),
-    gsSP1Quadrangle(14, 12, 13, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 8, 11, 0, 12, 11, 13, 0),
+    gsSP2Triangles(14, 12, 13, 0, 14, 13, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0400EB40, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 9, 11, 10, 0),
     gsSP2Triangles(8, 10, 12, 0, 13, 14, 15, 0),
     gsSP2Triangles(14, 16, 15, 0, 13, 15, 17, 0),
@@ -4438,21 +4438,21 @@ Gfx d_course_dks_jungle_parkway_packed_dl_76A0[] =
     gsSP2Triangles(1, 4, 2, 0, 5, 6, 7, 0),
     gsSP2Triangles(5, 7, 8, 0, 9, 10, 11, 0),
     gsSP2Triangles(9, 11, 12, 0, 3, 13, 14, 0),
-    gsSP1Quadrangle(3, 14, 15, 4, 0),
+    gsSP2Triangles(3, 14, 15, 0, 3, 15, 4, 0),
     gsSP2Triangles(16, 17, 18, 0, 17, 19, 18, 0),
     gsSP2Triangles(17, 20, 19, 0, 20, 21, 19, 0),
-    gsSP1Quadrangle(20, 22, 23, 21, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0400EFD0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0400F1D0, 30, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 4, 0),
     gsSP2Triangles(1, 4, 2, 0, 3, 5, 4, 0),
@@ -4460,7 +4460,7 @@ Gfx d_course_dks_jungle_parkway_packed_dl_76A0[] =
     gsSP2Triangles(9, 8, 10, 0, 11, 9, 10, 0),
     gsSP2Triangles(12, 13, 14, 0, 13, 15, 14, 0),
     gsSP2Triangles(12, 14, 16, 0, 17, 12, 16, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
     gsSP2Triangles(22, 18, 21, 0, 19, 23, 20, 0),
     gsSP2Triangles(24, 25, 26, 0, 27, 24, 26, 0),
     gsSP2Triangles(27, 26, 28, 0, 29, 27, 28, 0),
@@ -4479,33 +4479,33 @@ Gfx d_course_dks_jungle_parkway_packed_dl_77E8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400F3B0, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsSP2Triangles(10, 11, 8, 0, 7, 10, 8, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSP2Triangles(20, 21, 22, 0, 22, 21, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 11, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 11, 0),
     gsSP2Triangles(10, 24, 11, 0, 27, 28, 29, 0),
     gsSP1Triangle(27, 29, 30, 0),
     gsSPVertex(0x0400F5A0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(7, 9, 10, 0, 11, 12, 13, 0),
     gsSP2Triangles(14, 13, 12, 0, 15, 12, 16, 0),
     gsSP2Triangles(15, 16, 17, 0, 12, 18, 16, 0),
     gsSP2Triangles(19, 15, 17, 0, 15, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
     gsSP2Triangles(26, 14, 12, 0, 27, 28, 29, 0),
     gsSP2Triangles(30, 27, 29, 0, 27, 31, 28, 0),
     gsSPVertex(0x0400F7A0, 21, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(4, 6, 5, 0, 3, 5, 7, 0),
     gsSP2Triangles(8, 3, 7, 0, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 9, 11, 13, 0),
+    gsSP2Triangles(12, 9, 11, 0, 12, 11, 13, 0),
     gsSP2Triangles(14, 12, 13, 0, 15, 16, 17, 0),
-    gsSP1Quadrangle(16, 18, 19, 17, 0),
+    gsSP2Triangles(16, 18, 19, 0, 16, 19, 17, 0),
     gsSP1Triangle(18, 20, 19, 0),
     gsSPEndDisplayList(),
 };
@@ -4522,35 +4522,35 @@ Gfx d_course_dks_jungle_parkway_packed_dl_7920[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400F8F0, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(0, 4, 5, 1, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(6, 10, 11, 7, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(0, 4, 5, 0, 0, 5, 1, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(6, 10, 11, 0, 6, 11, 7, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSP2Triangles(16, 13, 12, 0, 12, 15, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(18, 22, 23, 19, 0),
-    gsSP1Quadrangle(20, 24, 25, 21, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(18, 22, 23, 0, 18, 23, 19, 0),
+    gsSP2Triangles(20, 24, 25, 0, 20, 25, 21, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSP1Triangle(26, 29, 30, 0),
     gsSPVertex(0x0400FAE0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(4, 8, 9, 5, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(11, 14, 15, 12, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(17, 20, 21, 18, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(22, 26, 27, 23, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(4, 8, 9, 0, 4, 9, 5, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(11, 14, 15, 0, 11, 15, 12, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(17, 20, 21, 0, 17, 21, 18, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(22, 26, 27, 0, 22, 27, 23, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0400FCE0, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(4, 8, 9, 5, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(11, 14, 15, 12, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(4, 8, 9, 0, 4, 9, 5, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(11, 14, 15, 0, 11, 15, 12, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSP2Triangles(20, 21, 22, 0, 23, 24, 25, 0),
     gsSP2Triangles(6, 26, 7, 0, 27, 28, 29, 0),
     gsSPVertex(0x0400FEC0, 7, 0),
@@ -4571,12 +4571,12 @@ Gfx d_course_dks_jungle_parkway_packed_dl_7A88[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400FF30, 18, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(7, 10, 11, 8, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(13, 16, 17, 14, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(7, 10, 11, 0, 7, 11, 8, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(13, 16, 17, 0, 13, 17, 14, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4602,30 +4602,30 @@ Gfx d_course_dks_jungle_parkway_packed_dl_7B10[] =
     gsSP2Triangles(17, 20, 18, 0, 21, 20, 19, 0),
     gsSP2Triangles(21, 19, 22, 0, 9, 23, 24, 0),
     gsSP2Triangles(9, 24, 10, 0, 25, 24, 23, 0),
-    gsSP1Quadrangle(15, 26, 27, 16, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(15, 26, 27, 0, 15, 27, 16, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04010250, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 6, 5, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 12, 11, 15, 0),
-    gsSP1Quadrangle(16, 0, 3, 17, 0),
-    gsSP1Quadrangle(17, 18, 19, 16, 0),
-    gsSP1Quadrangle(20, 14, 15, 21, 0),
-    gsSP1Quadrangle(21, 22, 23, 20, 0),
-    gsSP1Quadrangle(24, 8, 9, 25, 0),
-    gsSP1Quadrangle(25, 26, 27, 24, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 6, 5, 0, 8, 5, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 12, 11, 0, 14, 11, 15, 0),
+    gsSP2Triangles(16, 0, 3, 0, 16, 3, 17, 0),
+    gsSP2Triangles(17, 18, 19, 0, 17, 19, 16, 0),
+    gsSP2Triangles(20, 14, 15, 0, 20, 15, 21, 0),
+    gsSP2Triangles(21, 22, 23, 0, 21, 23, 20, 0),
+    gsSP2Triangles(24, 8, 9, 0, 24, 9, 25, 0),
+    gsSP2Triangles(25, 26, 27, 0, 25, 27, 24, 0),
     gsSP2Triangles(28, 29, 30, 0, 29, 31, 30, 0),
     gsSPVertex(0x04010450, 26, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 6, 7, 8, 0),
     gsSP2Triangles(6, 8, 4, 0, 9, 10, 11, 0),
     gsSP2Triangles(12, 10, 9, 0, 13, 8, 7, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(15, 18, 19, 16, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(21, 24, 25, 22, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(15, 18, 19, 0, 15, 19, 16, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(21, 24, 25, 0, 21, 25, 22, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4641,32 +4641,32 @@ Gfx d_course_dks_jungle_parkway_packed_dl_7C78[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040105F0, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
-    gsSP1Quadrangle(2, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 7, 6, 9, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
+    gsSP2Triangles(2, 5, 6, 0, 2, 6, 7, 0),
+    gsSP2Triangles(8, 7, 6, 0, 8, 6, 9, 0),
     gsSP2Triangles(8, 9, 1, 0, 9, 4, 1, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(11, 14, 15, 12, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(17, 20, 21, 18, 0),
-    gsSP1Quadrangle(22, 0, 3, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(25, 28, 29, 26, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(11, 14, 15, 0, 11, 15, 12, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(17, 20, 21, 0, 17, 21, 18, 0),
+    gsSP2Triangles(22, 0, 3, 0, 22, 3, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(25, 28, 29, 0, 25, 29, 26, 0),
     gsSPVertex(0x040107D0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(4, 14, 15, 5, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(17, 20, 21, 22, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(4, 14, 15, 0, 4, 15, 5, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(17, 20, 21, 0, 17, 21, 22, 0),
     gsSP2Triangles(17, 22, 18, 0, 23, 24, 25, 0),
     gsSP2Triangles(23, 25, 26, 0, 26, 25, 27, 0),
     gsSP2Triangles(26, 27, 28, 0, 29, 16, 19, 0),
     gsSP2Triangles(29, 19, 30, 0, 20, 31, 21, 0),
     gsSPVertex(0x040109D0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4682,15 +4682,15 @@ Gfx d_course_dks_jungle_parkway_packed_dl_7DA0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04010A10, 23, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 1, 0, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 1, 0, 0, 4, 0, 5, 0),
     gsSP2Triangles(2, 6, 7, 0, 2, 8, 9, 0),
     gsSP2Triangles(2, 9, 3, 0, 10, 11, 12, 0),
     gsSP2Triangles(10, 12, 5, 0, 13, 14, 15, 0),
     gsSP2Triangles(13, 15, 12, 0, 1, 4, 16, 0),
-    gsSP1Quadrangle(9, 17, 18, 19, 0),
-    gsSP1Quadrangle(17, 20, 21, 22, 0),
-    gsSP1Quadrangle(11, 10, 19, 18, 0),
+    gsSP2Triangles(9, 17, 18, 0, 9, 18, 19, 0),
+    gsSP2Triangles(17, 20, 21, 0, 17, 21, 22, 0),
+    gsSP2Triangles(11, 10, 19, 0, 11, 19, 18, 0),
     gsSP2Triangles(7, 8, 2, 0, 21, 14, 13, 0),
     gsSP1Triangle(21, 13, 22, 0),
     gsSPEndDisplayList(),
@@ -4708,28 +4708,28 @@ Gfx d_course_dks_jungle_parkway_packed_dl_7E50[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04010B80, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(7, 10, 11, 8, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(13, 16, 17, 14, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(19, 22, 23, 20, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(25, 28, 29, 26, 0),
-    gsSP1Quadrangle(10, 30, 31, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(7, 10, 11, 0, 7, 11, 8, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(13, 16, 17, 0, 13, 17, 14, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(19, 22, 23, 0, 19, 23, 20, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(25, 28, 29, 0, 25, 29, 26, 0),
+    gsSP2Triangles(10, 30, 31, 0, 10, 31, 11, 0),
     gsSPVertex(0x04010D80, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(9, 12, 13, 10, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(15, 18, 19, 16, 0),
-    gsSP1Quadrangle(20, 8, 11, 21, 0),
-    gsSP1Quadrangle(22, 14, 17, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(9, 12, 13, 0, 9, 13, 10, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(15, 18, 19, 0, 15, 19, 16, 0),
+    gsSP2Triangles(20, 8, 11, 0, 20, 11, 21, 0),
+    gsSP2Triangles(22, 14, 17, 0, 22, 17, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4745,9 +4745,9 @@ Gfx d_course_dks_jungle_parkway_packed_dl_7F58[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04010F80, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 0, 3, 5, 0),
-    gsSP1Quadrangle(1, 6, 7, 2, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 0, 3, 0, 4, 3, 5, 0),
+    gsSP2Triangles(1, 6, 7, 0, 1, 7, 2, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4763,22 +4763,22 @@ Gfx d_course_dks_jungle_parkway_packed_dl_7FC8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04011000, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(7, 10, 11, 8, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(13, 16, 17, 14, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(19, 22, 23, 20, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(25, 28, 29, 26, 0),
-    gsSP1Quadrangle(30, 0, 3, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(7, 10, 11, 0, 7, 11, 8, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(13, 16, 17, 0, 13, 17, 14, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(19, 22, 23, 0, 19, 23, 20, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(25, 28, 29, 0, 25, 29, 26, 0),
+    gsSP2Triangles(30, 0, 3, 0, 30, 3, 31, 0),
     gsSPVertex(0x04011200, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4794,15 +4794,15 @@ Gfx d_course_dks_jungle_parkway_packed_dl_80A0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04011300, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(7, 10, 11, 8, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(13, 16, 17, 14, 0),
-    gsSP1Quadrangle(18, 0, 3, 19, 0),
-    gsSP1Quadrangle(16, 20, 21, 17, 0),
-    gsSP1Quadrangle(10, 22, 23, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(7, 10, 11, 0, 7, 11, 8, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(13, 16, 17, 0, 13, 17, 14, 0),
+    gsSP2Triangles(18, 0, 3, 0, 18, 3, 19, 0),
+    gsSP2Triangles(16, 20, 21, 0, 16, 21, 17, 0),
+    gsSP2Triangles(10, 22, 23, 0, 10, 23, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4818,62 +4818,62 @@ Gfx d_course_dks_jungle_parkway_packed_dl_8140[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04011480, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 4, 5, 0, 0),
-    gsSP1Quadrangle(1, 6, 7, 2, 0),
-    gsSP1Quadrangle(8, 7, 6, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(13, 14, 15, 10, 0),
-    gsSP1Quadrangle(11, 16, 17, 12, 0),
-    gsSP1Quadrangle(18, 17, 16, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(23, 24, 25, 20, 0),
-    gsSP1Quadrangle(21, 26, 27, 22, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 4, 5, 0, 3, 5, 0, 0),
+    gsSP2Triangles(1, 6, 7, 0, 1, 7, 2, 0),
+    gsSP2Triangles(8, 7, 6, 0, 8, 6, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(13, 14, 15, 0, 13, 15, 10, 0),
+    gsSP2Triangles(11, 16, 17, 0, 11, 17, 12, 0),
+    gsSP2Triangles(18, 17, 16, 0, 18, 16, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(23, 24, 25, 0, 23, 25, 20, 0),
+    gsSP2Triangles(21, 26, 27, 0, 21, 27, 22, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04011680, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 2, 1, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 8, 7, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 14, 13, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 20, 19, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 26, 25, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 2, 1, 0, 4, 1, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 8, 7, 0, 10, 7, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 14, 13, 0, 16, 13, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 20, 19, 0, 22, 19, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 26, 25, 0, 28, 25, 29, 0),
     gsSPVertex(0x04011860, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 2, 1, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(17, 18, 19, 14, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(15, 22, 21, 16, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 26, 25, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 2, 1, 0, 4, 1, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(17, 18, 19, 0, 17, 19, 14, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(15, 22, 21, 0, 15, 21, 16, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 26, 25, 0, 28, 25, 29, 0),
     gsSPVertex(0x04011A40, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(7, 8, 9, 4, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(13, 14, 15, 10, 0),
-    gsSP1Quadrangle(3, 16, 17, 0, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(21, 22, 23, 18, 0),
-    gsSP1Quadrangle(19, 24, 25, 20, 0),
-    gsSP1Quadrangle(26, 25, 24, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(7, 8, 9, 0, 7, 9, 4, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(13, 14, 15, 0, 13, 15, 10, 0),
+    gsSP2Triangles(3, 16, 17, 0, 3, 17, 0, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(21, 22, 23, 0, 21, 23, 18, 0),
+    gsSP2Triangles(19, 24, 25, 0, 19, 25, 20, 0),
+    gsSP2Triangles(26, 25, 24, 0, 26, 24, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04011C40, 26, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(7, 8, 9, 4, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(13, 14, 15, 10, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(19, 20, 21, 16, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(17, 24, 23, 18, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(7, 8, 9, 0, 7, 9, 4, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(13, 14, 15, 0, 13, 15, 10, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(19, 20, 21, 0, 19, 21, 16, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(17, 24, 23, 0, 17, 23, 18, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4889,27 +4889,27 @@ Gfx d_course_dks_jungle_parkway_packed_dl_8358[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04011DE0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 10, 9, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(17, 12, 13, 14, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(25, 26, 27, 22, 0),
-    gsSP1Quadrangle(23, 28, 29, 24, 0),
-    gsSP1Quadrangle(30, 29, 28, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 10, 9, 0, 12, 9, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(17, 12, 13, 0, 17, 13, 14, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(25, 26, 27, 0, 25, 27, 22, 0),
+    gsSP2Triangles(23, 28, 29, 0, 23, 29, 24, 0),
+    gsSP2Triangles(30, 29, 28, 0, 30, 28, 31, 0),
     gsSPVertex(0x04011FE0, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(5, 8, 9, 6, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 10, 13, 15, 0),
-    gsSP1Quadrangle(15, 16, 17, 14, 0),
-    gsSP1Quadrangle(7, 18, 19, 4, 0),
-    gsSP1Quadrangle(3, 20, 21, 0, 0),
-    gsSP1Quadrangle(20, 22, 23, 21, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(5, 8, 9, 0, 5, 9, 6, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 10, 13, 0, 14, 13, 15, 0),
+    gsSP2Triangles(15, 16, 17, 0, 15, 17, 14, 0),
+    gsSP2Triangles(7, 18, 19, 0, 7, 19, 4, 0),
+    gsSP2Triangles(3, 20, 21, 0, 3, 21, 0, 0),
+    gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4925,36 +4925,36 @@ Gfx d_course_dks_jungle_parkway_packed_dl_8458[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04012160, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSP2Triangles(8, 12, 9, 0, 13, 14, 15, 0),
     gsSP2Triangles(13, 15, 16, 0, 17, 18, 19, 0),
     gsSP2Triangles(17, 19, 20, 0, 21, 22, 23, 0),
     gsSP2Triangles(21, 23, 24, 0, 25, 26, 27, 0),
     gsSP2Triangles(25, 27, 28, 0, 29, 26, 25, 0),
     gsSPVertex(0x04012340, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(7, 8, 9, 4, 0),
-    gsSP1Quadrangle(8, 10, 11, 9, 0),
-    gsSP1Quadrangle(12, 11, 10, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(23, 22, 26, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(7, 8, 9, 0, 7, 9, 4, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0),
+    gsSP2Triangles(12, 11, 10, 0, 12, 10, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(23, 22, 26, 0, 23, 26, 27, 0),
     gsSP2Triangles(22, 28, 26, 0, 29, 22, 25, 0),
     gsSP2Triangles(29, 25, 30, 0, 22, 29, 28, 0),
     gsSP1Triangle(29, 31, 28, 0),
     gsSPVertex(0x04012540, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 0, 3, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(7, 10, 11, 8, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(13, 16, 17, 14, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(19, 22, 23, 20, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 0, 3, 0, 4, 3, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(7, 10, 11, 0, 7, 11, 8, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(13, 16, 17, 0, 13, 17, 14, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(19, 22, 23, 0, 19, 23, 20, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4970,16 +4970,16 @@ Gfx d_course_dks_jungle_parkway_packed_dl_85A0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x040126C0, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 5, 4, 0),
-    gsSP1Quadrangle(7, 6, 10, 11, 0),
-    gsSP1Quadrangle(11, 10, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 9, 8, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(17, 16, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 15, 14, 0),
-    gsSP1Quadrangle(19, 18, 23, 22, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 5, 0, 8, 5, 4, 0),
+    gsSP2Triangles(7, 6, 10, 0, 7, 10, 11, 0),
+    gsSP2Triangles(11, 10, 12, 0, 11, 12, 13, 0),
+    gsSP2Triangles(14, 15, 9, 0, 14, 9, 8, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(17, 16, 20, 0, 17, 20, 21, 0),
+    gsSP2Triangles(22, 23, 15, 0, 22, 15, 14, 0),
+    gsSP2Triangles(19, 18, 23, 0, 19, 23, 22, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4995,8 +4995,8 @@ Gfx d_course_dks_jungle_parkway_packed_dl_8648[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04012840, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5012,17 +5012,17 @@ Gfx d_course_dks_jungle_parkway_packed_dl_86B0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x040128C0, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(7, 6, 8, 9, 0),
-    gsSP1Quadrangle(9, 8, 10, 11, 0),
-    gsSP1Quadrangle(11, 10, 12, 13, 0),
-    gsSP1Quadrangle(13, 12, 14, 15, 0),
-    gsSP1Quadrangle(15, 14, 1, 0, 0),
-    gsSP1Quadrangle(16, 17, 5, 4, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(21, 20, 22, 23, 0),
-    gsSP1Quadrangle(23, 22, 17, 16, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(7, 6, 8, 0, 7, 8, 9, 0),
+    gsSP2Triangles(9, 8, 10, 0, 9, 10, 11, 0),
+    gsSP2Triangles(11, 10, 12, 0, 11, 12, 13, 0),
+    gsSP2Triangles(13, 12, 14, 0, 13, 14, 15, 0),
+    gsSP2Triangles(15, 14, 1, 0, 15, 1, 0, 0),
+    gsSP2Triangles(16, 17, 5, 0, 16, 5, 4, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(21, 20, 22, 0, 21, 22, 23, 0),
+    gsSP2Triangles(23, 22, 17, 0, 23, 17, 16, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5038,15 +5038,15 @@ Gfx d_course_dks_jungle_parkway_packed_dl_8760[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04012A40, 22, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
-    gsSP1Quadrangle(5, 4, 6, 7, 0),
-    gsSP1Quadrangle(7, 6, 8, 9, 0),
-    gsSP1Quadrangle(9, 8, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(15, 14, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(11, 10, 19, 18, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
+    gsSP2Triangles(5, 4, 6, 0, 5, 6, 7, 0),
+    gsSP2Triangles(7, 6, 8, 0, 7, 8, 9, 0),
+    gsSP2Triangles(9, 8, 10, 0, 9, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(15, 14, 16, 0, 15, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(11, 10, 19, 0, 11, 19, 18, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5062,49 +5062,49 @@ Gfx d_course_dks_jungle_parkway_packed_dl_8800[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04012BA0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 4, 5, 0, 0),
-    gsSP1Quadrangle(1, 6, 7, 2, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 8, 11, 13, 0),
-    gsSP1Quadrangle(14, 10, 9, 15, 0),
-    gsSP1Quadrangle(13, 16, 17, 12, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(19, 22, 23, 20, 0),
-    gsSP1Quadrangle(24, 23, 22, 25, 0),
-    gsSP1Quadrangle(26, 7, 6, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 4, 5, 0, 3, 5, 0, 0),
+    gsSP2Triangles(1, 6, 7, 0, 1, 7, 2, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 8, 11, 0, 12, 11, 13, 0),
+    gsSP2Triangles(14, 10, 9, 0, 14, 9, 15, 0),
+    gsSP2Triangles(13, 16, 17, 0, 13, 17, 12, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(19, 22, 23, 0, 19, 23, 20, 0),
+    gsSP2Triangles(24, 23, 22, 0, 24, 22, 25, 0),
+    gsSP2Triangles(26, 7, 6, 0, 26, 6, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04012DA0, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 2, 1, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 10, 13, 15, 0),
-    gsSP1Quadrangle(16, 12, 11, 17, 0),
-    gsSP1Quadrangle(15, 18, 19, 14, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 26, 25, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 2, 1, 0, 4, 1, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 10, 13, 0, 14, 13, 15, 0),
+    gsSP2Triangles(16, 12, 11, 0, 16, 11, 17, 0),
+    gsSP2Triangles(15, 18, 19, 0, 15, 19, 14, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 26, 25, 0, 28, 25, 29, 0),
     gsSPVertex(0x04012F80, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
-    gsSP1Quadrangle(6, 5, 4, 7, 0),
-    gsSP1Quadrangle(3, 8, 9, 0, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 10, 13, 15, 0),
-    gsSP1Quadrangle(16, 12, 11, 17, 0),
-    gsSP1Quadrangle(15, 18, 19, 14, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(23, 24, 25, 20, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
+    gsSP2Triangles(6, 5, 4, 0, 6, 4, 7, 0),
+    gsSP2Triangles(3, 8, 9, 0, 3, 9, 0, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 10, 13, 0, 14, 13, 15, 0),
+    gsSP2Triangles(16, 12, 11, 0, 16, 11, 17, 0),
+    gsSP2Triangles(15, 18, 19, 0, 15, 19, 14, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(23, 24, 25, 0, 23, 25, 20, 0),
     gsSP2Triangles(26, 27, 22, 0, 21, 26, 22, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04013180, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 2, 1, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(17, 18, 19, 14, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 2, 1, 0, 8, 1, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(17, 18, 19, 0, 17, 19, 14, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5122,7 +5122,7 @@ Gfx d_course_dks_jungle_parkway_packed_dl_89B0[] =
     gsSPVertex(0x040132C0, 13, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
     gsSP2Triangles(3, 4, 2, 0, 4, 5, 2, 0),
-    gsSP1Quadrangle(5, 6, 7, 2, 0),
+    gsSP2Triangles(5, 6, 7, 0, 5, 7, 2, 0),
     gsSP2Triangles(8, 9, 10, 0, 8, 11, 9, 0),
     gsSP2Triangles(9, 12, 10, 0, 9, 11, 7, 0),
     gsSP2Triangles(11, 0, 7, 0, 6, 12, 9, 0),
@@ -5142,40 +5142,40 @@ Gfx d_course_dks_jungle_parkway_packed_dl_8A40[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04013390, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 2, 1, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 8, 7, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 14, 13, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(21, 22, 23, 18, 0),
-    gsSP1Quadrangle(24, 4, 5, 25, 0),
-    gsSP1Quadrangle(25, 26, 27, 24, 0),
-    gsSP1Quadrangle(28, 10, 11, 29, 0),
-    gsSP1Quadrangle(29, 30, 31, 28, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 2, 1, 0, 4, 1, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 8, 7, 0, 10, 7, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 14, 13, 0, 16, 13, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(21, 22, 23, 0, 21, 23, 18, 0),
+    gsSP2Triangles(24, 4, 5, 0, 24, 5, 25, 0),
+    gsSP2Triangles(25, 26, 27, 0, 25, 27, 24, 0),
+    gsSP2Triangles(28, 10, 11, 0, 28, 11, 29, 0),
+    gsSP2Triangles(29, 30, 31, 0, 29, 31, 28, 0),
     gsSPVertex(0x04013590, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 4, 5, 0, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 8, 7, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(15, 16, 17, 12, 0),
-    gsSP1Quadrangle(16, 18, 19, 17, 0),
-    gsSP1Quadrangle(20, 19, 18, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 24, 23, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 4, 5, 0, 3, 5, 0, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 8, 7, 0, 10, 7, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(15, 16, 17, 0, 15, 17, 12, 0),
+    gsSP2Triangles(16, 18, 19, 0, 16, 19, 17, 0),
+    gsSP2Triangles(20, 19, 18, 0, 20, 18, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 24, 23, 0, 26, 23, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04013790, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 6, 5, 9, 0),
-    gsSP1Quadrangle(10, 8, 9, 11, 0),
-    gsSP1Quadrangle(11, 12, 13, 10, 0),
-    gsSP1Quadrangle(14, 0, 3, 15, 0),
-    gsSP1Quadrangle(15, 16, 17, 14, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(21, 22, 23, 18, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 6, 5, 0, 8, 5, 9, 0),
+    gsSP2Triangles(10, 8, 9, 0, 10, 9, 11, 0),
+    gsSP2Triangles(11, 12, 13, 0, 11, 13, 10, 0),
+    gsSP2Triangles(14, 0, 3, 0, 14, 3, 15, 0),
+    gsSP2Triangles(15, 16, 17, 0, 15, 17, 14, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(21, 22, 23, 0, 21, 23, 18, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5191,18 +5191,18 @@ Gfx d_course_dks_jungle_parkway_packed_dl_8BA8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04013910, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 4, 5, 0, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(9, 10, 11, 6, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(1, 14, 13, 2, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 18, 17, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(7, 24, 23, 8, 0),
-    gsSP1Quadrangle(26, 20, 21, 27, 0),
-    gsSP1Quadrangle(27, 28, 29, 26, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 4, 5, 0, 3, 5, 0, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(9, 10, 11, 0, 9, 11, 6, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(1, 14, 13, 0, 1, 13, 2, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 18, 17, 0, 20, 17, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(7, 24, 23, 0, 7, 23, 8, 0),
+    gsSP2Triangles(26, 20, 21, 0, 26, 21, 27, 0),
+    gsSP2Triangles(27, 28, 29, 0, 27, 29, 26, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5218,62 +5218,62 @@ Gfx d_course_dks_jungle_parkway_packed_dl_8C60[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04013AF0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 4, 5, 0, 0),
-    gsSP1Quadrangle(1, 6, 7, 2, 0),
-    gsSP1Quadrangle(8, 7, 6, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(13, 14, 15, 10, 0),
-    gsSP1Quadrangle(11, 16, 17, 12, 0),
-    gsSP1Quadrangle(18, 17, 16, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(23, 24, 25, 20, 0),
-    gsSP1Quadrangle(21, 26, 27, 22, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 4, 5, 0, 3, 5, 0, 0),
+    gsSP2Triangles(1, 6, 7, 0, 1, 7, 2, 0),
+    gsSP2Triangles(8, 7, 6, 0, 8, 6, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(13, 14, 15, 0, 13, 15, 10, 0),
+    gsSP2Triangles(11, 16, 17, 0, 11, 17, 12, 0),
+    gsSP2Triangles(18, 17, 16, 0, 18, 16, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(23, 24, 25, 0, 23, 25, 20, 0),
+    gsSP2Triangles(21, 26, 27, 0, 21, 27, 22, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04013CF0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 2, 1, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 8, 7, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(15, 16, 17, 12, 0),
-    gsSP1Quadrangle(13, 18, 19, 14, 0),
-    gsSP1Quadrangle(20, 19, 18, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(25, 26, 27, 22, 0),
-    gsSP1Quadrangle(23, 28, 29, 24, 0),
-    gsSP1Quadrangle(30, 29, 28, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 2, 1, 0, 4, 1, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 8, 7, 0, 10, 7, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(15, 16, 17, 0, 15, 17, 12, 0),
+    gsSP2Triangles(13, 18, 19, 0, 13, 19, 14, 0),
+    gsSP2Triangles(20, 19, 18, 0, 20, 18, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(25, 26, 27, 0, 25, 27, 22, 0),
+    gsSP2Triangles(23, 28, 29, 0, 23, 29, 24, 0),
+    gsSP2Triangles(30, 29, 28, 0, 30, 28, 31, 0),
     gsSPVertex(0x04013EF0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 10, 9, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(15, 18, 19, 16, 0),
-    gsSP1Quadrangle(20, 19, 18, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(25, 26, 27, 22, 0),
-    gsSP1Quadrangle(23, 28, 29, 24, 0),
-    gsSP1Quadrangle(30, 29, 28, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 10, 9, 0, 12, 9, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(15, 18, 19, 0, 15, 19, 16, 0),
+    gsSP2Triangles(20, 19, 18, 0, 20, 18, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(25, 26, 27, 0, 25, 27, 22, 0),
+    gsSP2Triangles(23, 28, 29, 0, 23, 29, 24, 0),
+    gsSP2Triangles(30, 29, 28, 0, 30, 28, 31, 0),
     gsSPVertex(0x040140F0, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 4, 5, 0, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(13, 14, 15, 10, 0),
-    gsSP1Quadrangle(11, 16, 17, 12, 0),
-    gsSP1Quadrangle(18, 17, 16, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(23, 24, 25, 20, 0),
-    gsSP1Quadrangle(21, 26, 27, 22, 0),
-    gsSP1Quadrangle(28, 27, 26, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 4, 5, 0, 3, 5, 0, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(13, 14, 15, 0, 13, 15, 10, 0),
+    gsSP2Triangles(11, 16, 17, 0, 11, 17, 12, 0),
+    gsSP2Triangles(18, 17, 16, 0, 18, 16, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(23, 24, 25, 0, 23, 25, 20, 0),
+    gsSP2Triangles(21, 26, 27, 0, 21, 27, 22, 0),
+    gsSP2Triangles(28, 27, 26, 0, 28, 26, 29, 0),
     gsSPVertex(0x040142D0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 4, 5, 0, 0),
-    gsSP1Quadrangle(1, 6, 7, 2, 0),
-    gsSP1Quadrangle(8, 7, 6, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(13, 14, 15, 10, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 4, 5, 0, 3, 5, 0, 0),
+    gsSP2Triangles(1, 6, 7, 0, 1, 7, 2, 0),
+    gsSP2Triangles(8, 7, 6, 0, 8, 6, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(13, 14, 15, 0, 13, 15, 10, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5289,18 +5289,18 @@ Gfx d_course_dks_jungle_parkway_packed_dl_8E78[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040143D0, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 2, 1, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(9, 10, 11, 6, 0),
-    gsSP1Quadrangle(10, 12, 13, 11, 0),
-    gsSP1Quadrangle(14, 13, 12, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 18, 17, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(25, 20, 21, 22, 0),
-    gsSP1Quadrangle(26, 4, 5, 27, 0),
-    gsSP1Quadrangle(27, 28, 29, 26, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 2, 1, 0, 4, 1, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(9, 10, 11, 0, 9, 11, 6, 0),
+    gsSP2Triangles(10, 12, 13, 0, 10, 13, 11, 0),
+    gsSP2Triangles(14, 13, 12, 0, 14, 12, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 18, 17, 0, 20, 17, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(25, 20, 21, 0, 25, 21, 22, 0),
+    gsSP2Triangles(26, 4, 5, 0, 26, 5, 27, 0),
+    gsSP2Triangles(27, 28, 29, 0, 27, 29, 26, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5346,19 +5346,19 @@ Gfx d_course_dks_jungle_parkway_packed_dl_9000[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x040145B0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x040147B0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -5387,19 +5387,19 @@ Gfx d_course_dks_jungle_parkway_packed_dl_9128[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04014970, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04014B70, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -5432,7 +5432,7 @@ Gfx d_course_dks_jungle_parkway_packed_dl_9268[] =
     gsSP2Triangles(2, 5, 6, 0, 7, 4, 3, 0),
     gsSP2Triangles(8, 4, 7, 0, 9, 8, 7, 0),
     gsSP2Triangles(5, 10, 11, 0, 6, 5, 11, 0),
-    gsSP1Quadrangle(11, 10, 12, 13, 0),
+    gsSP2Triangles(11, 10, 12, 0, 11, 12, 13, 0),
     gsSP2Triangles(14, 8, 9, 0, 15, 16, 17, 0),
     gsSP2Triangles(15, 17, 18, 0, 19, 20, 15, 0),
     gsSP2Triangles(20, 16, 15, 0, 21, 22, 19, 0),
@@ -5452,9 +5452,9 @@ Gfx d_course_dks_jungle_parkway_packed_dl_92E8[] =
     gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x04014ED0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
     gsDPTileSync(),
@@ -5466,9 +5466,9 @@ Gfx d_course_dks_jungle_parkway_packed_dl_92E8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04014F90, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5477,7 +5477,7 @@ Gfx d_course_dks_jungle_parkway_packed_dl_9390[] =
     gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x04015050, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
     gsDPTileSync(),
@@ -5489,7 +5489,7 @@ Gfx d_course_dks_jungle_parkway_packed_dl_9390[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04015090, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5498,10 +5498,10 @@ Gfx d_course_dks_jungle_parkway_packed_dl_9418[] =
     gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x040150D0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
     gsDPTileSync(),
@@ -5513,10 +5513,10 @@ Gfx d_course_dks_jungle_parkway_packed_dl_9418[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040151D0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5525,10 +5525,10 @@ Gfx d_course_dks_jungle_parkway_packed_dl_94D0[] =
     gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x040152D0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
     gsDPTileSync(),
@@ -5540,10 +5540,10 @@ Gfx d_course_dks_jungle_parkway_packed_dl_94D0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040153D0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5552,9 +5552,9 @@ Gfx d_course_dks_jungle_parkway_packed_dl_9588[] =
     gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x040154D0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
     gsDPTileSync(),
@@ -5566,9 +5566,9 @@ Gfx d_course_dks_jungle_parkway_packed_dl_9588[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04015590, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5577,11 +5577,11 @@ Gfx d_course_dks_jungle_parkway_packed_dl_9630[] =
     gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x04015650, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
     gsDPTileSync(),
@@ -5593,11 +5593,11 @@ Gfx d_course_dks_jungle_parkway_packed_dl_9630[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04015790, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5606,8 +5606,8 @@ Gfx d_course_dks_jungle_parkway_packed_dl_96F8[] =
     gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x040158D0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
     gsDPTileSync(),
@@ -5619,8 +5619,8 @@ Gfx d_course_dks_jungle_parkway_packed_dl_96F8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04015950, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5629,9 +5629,9 @@ Gfx d_course_dks_jungle_parkway_packed_dl_9790[] =
     gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x040159D0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
     gsDPTileSync(),
@@ -5643,9 +5643,9 @@ Gfx d_course_dks_jungle_parkway_packed_dl_9790[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04015A90, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5674,7 +5674,7 @@ Gfx d_course_dks_jungle_parkway_packed_dl_9880[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04015B50, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5696,14 +5696,14 @@ Gfx d_course_dks_jungle_parkway_packed_dl_98F0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04015B90, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5719,9 +5719,9 @@ Gfx d_course_dks_jungle_parkway_packed_dl_9988[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04015D90, 22, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 8, 9, 10, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 8, 9, 0, 8, 9, 10, 0),
     gsSP2Triangles(8, 10, 3, 0, 11, 12, 2, 0),
     gsSP2Triangles(11, 2, 13, 0, 10, 0, 3, 0),
     gsSP2Triangles(1, 13, 2, 0, 14, 15, 16, 0),
@@ -5750,7 +5750,7 @@ Gfx d_course_dks_jungle_parkway_packed_dl_9A38[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04015EF0, 10, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 0, 2, 0),
-    gsSP1Quadrangle(2, 1, 4, 5, 0),
+    gsSP2Triangles(2, 1, 4, 0, 2, 4, 5, 0),
     gsSP2Triangles(6, 3, 2, 0, 7, 6, 2, 0),
     gsSP2Triangles(7, 2, 8, 0, 2, 9, 8, 0),
     gsSP1Triangle(2, 5, 9, 0),
@@ -5763,25 +5763,25 @@ Gfx d_course_dks_jungle_parkway_packed_dl_9A38[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04015F90, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 6, 9, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(13, 16, 17, 14, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(19, 22, 23, 20, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(25, 28, 29, 26, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 6, 9, 0, 10, 9, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(13, 16, 17, 0, 13, 17, 14, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(19, 22, 23, 0, 19, 23, 20, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(25, 28, 29, 0, 25, 29, 26, 0),
     gsSPVertex(0x04016170, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(7, 10, 11, 8, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 12, 15, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(19, 22, 23, 20, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(7, 10, 11, 0, 7, 11, 8, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 12, 15, 0, 16, 15, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(19, 22, 23, 0, 19, 23, 20, 0),
     gsSPEndDisplayList(),
 };
 
diff --git a/courses/special_cup/rainbow_road/course_data.inc.c b/courses/special_cup/rainbow_road/course_data.inc.c
index 4b977bfc0..dc30bfe94 100644
--- a/courses/special_cup/rainbow_road/course_data.inc.c
+++ b/courses/special_cup/rainbow_road/course_data.inc.c
@@ -3182,10 +3182,10 @@ Gfx d_course_rainbow_road_dl_15550[] =
     gsSP2Triangles(21, 30, 22, 0, 22, 30, 31, 0),
     gsSP1Triangle(22, 31, 23, 0),
     gsSPVertex(d_course_rainbow_road_chomp_body_lower_model2, 11, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
-    gsSP1Quadrangle(6, 7, 4, 1, 0),
-    gsSP1Quadrangle(8, 9, 7, 6, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
+    gsSP2Triangles(6, 7, 4, 0, 6, 4, 1, 0),
+    gsSP2Triangles(8, 9, 7, 0, 8, 7, 6, 0),
     gsSP1Triangle(9, 8, 10, 0),
     gsSPClearGeometryMode(G_TEXTURE_GEN),
     gsDPPipeSync(),
@@ -3200,7 +3200,7 @@ Gfx d_course_rainbow_road_dl_15550[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(d_course_rainbow_road_chomp_body_lower_model3, 5, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP1Triangle(0, 4, 1, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
     gsDPPipeSync(),
@@ -3345,10 +3345,10 @@ Gfx d_course_rainbow_road_dl_15C68[] =
     gsSP2Triangles(22, 29, 21, 0, 23, 31, 30, 0),
     gsSP1Triangle(23, 30, 22, 0),
     gsSPVertex(d_course_rainbow_road_chomp_body_upper_back_model2, 11, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
-    gsSP1Quadrangle(2, 5, 6, 7, 0),
-    gsSP1Quadrangle(7, 6, 8, 9, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
+    gsSP2Triangles(2, 5, 6, 0, 2, 6, 7, 0),
+    gsSP2Triangles(7, 6, 8, 0, 7, 8, 9, 0),
     gsSP1Triangle(10, 9, 8, 0),
     gsSPClearGeometryMode(G_TEXTURE_GEN),
     gsDPPipeSync(),
diff --git a/courses/special_cup/rainbow_road/packed.inc.c b/courses/special_cup/rainbow_road/packed.inc.c
index 3cd209ba8..e66177cc4 100644
--- a/courses/special_cup/rainbow_road/packed.inc.c
+++ b/courses/special_cup/rainbow_road/packed.inc.c
@@ -10,100 +10,100 @@ Gfx d_course_rainbow_road_packed_dl_0[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04000000, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04000200, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04000400, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04000600, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04000800, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04000A00, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04000C00, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04000E00, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04001000, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04001200, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04001400, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -111,53 +111,53 @@ Gfx d_course_rainbow_road_packed_dl_308[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04001500, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04001700, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04001900, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04001B00, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04001D00, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04001F00, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -165,41 +165,41 @@ Gfx d_course_rainbow_road_packed_dl_498[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04001F80, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04002180, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04002380, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04002580, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -207,48 +207,48 @@ Gfx d_course_rainbow_road_packed_dl_5C8[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04002780, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04002980, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04002B80, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04002D80, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04002F80, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -256,64 +256,64 @@ Gfx d_course_rainbow_road_packed_dl_730[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04003100, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04003300, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04003500, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04003700, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04003900, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 6, 9, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 6, 9, 0, 10, 9, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04003B00, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04003D00, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -321,41 +321,41 @@ Gfx d_course_rainbow_road_packed_dl_918[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04003DC0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04003FC0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x040041C0, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(6, 8, 9, 7, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(6, 8, 9, 0, 6, 9, 7, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPVertex(0x040043A0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -363,44 +363,44 @@ Gfx d_course_rainbow_road_packed_dl_A48[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x040045A0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x040047A0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x040049A0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04004BA0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04004DA0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -408,66 +408,66 @@ Gfx d_course_rainbow_road_packed_dl_B90[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04004E20, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04005020, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04005220, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04005420, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04005620, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04005820, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04005A20, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -475,39 +475,39 @@ Gfx d_course_rainbow_road_packed_dl_D88[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04005BA0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04005DA0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04005FA0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x040061A0, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -515,44 +515,44 @@ Gfx d_course_rainbow_road_packed_dl_EA8[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04006320, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04006520, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04006720, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04006920, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04006B20, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -560,50 +560,50 @@ Gfx d_course_rainbow_road_packed_dl_FF0[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04006BA0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04006DA0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04006FA0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x040071A0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x040073A0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -611,57 +611,57 @@ Gfx d_course_rainbow_road_packed_dl_1168[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x040075A0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x040077A0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x040079A0, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(26, 28, 29, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(26, 28, 29, 0, 26, 29, 27, 0),
     gsSPVertex(0x04007B80, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04007D80, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04007F80, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -698,52 +698,52 @@ Gfx d_course_rainbow_road_packed_dl_13A0[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04008100, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 4, 7, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(2, 14, 15, 3, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 24, 27, 0),
-    gsSP1Quadrangle(30, 31, 10, 13, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 4, 0, 8, 4, 7, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(2, 14, 15, 0, 2, 15, 3, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 24, 0, 28, 24, 27, 0),
+    gsSP2Triangles(30, 31, 10, 0, 30, 10, 13, 0),
     gsSPVertex(0x04008300, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 0, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 18, 21, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 24, 27, 0),
-    gsSP1Quadrangle(16, 30, 31, 17, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 0, 0, 4, 0, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 18, 0, 22, 18, 21, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 24, 0, 28, 24, 27, 0),
+    gsSP2Triangles(16, 30, 31, 0, 16, 31, 17, 0),
     gsSPVertex(0x04008500, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04008700, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04008900, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -751,29 +751,29 @@ Gfx d_course_rainbow_road_packed_dl_1528[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04008A80, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(8, 10, 11, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 12, 15, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
-    gsSP1Quadrangle(28, 30, 31, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 12, 0, 16, 12, 15, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
+    gsSP2Triangles(28, 30, 31, 0, 28, 31, 29, 0),
     gsSPVertex(0x04008C80, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
-    gsSP1Quadrangle(28, 30, 31, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
+    gsSP2Triangles(28, 30, 31, 0, 28, 31, 29, 0),
     gsSPVertex(0x04008E80, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -781,23 +781,23 @@ Gfx d_course_rainbow_road_packed_dl_15F8[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04008F00, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04009100, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -805,27 +805,27 @@ Gfx d_course_rainbow_road_packed_dl_1698[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04009300, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04009500, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(6, 8, 9, 7, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(12, 14, 15, 13, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(18, 20, 21, 19, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(24, 26, 27, 25, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(6, 8, 9, 0, 6, 9, 7, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(12, 14, 15, 0, 12, 15, 13, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(18, 20, 21, 0, 18, 21, 19, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(24, 26, 27, 0, 24, 27, 25, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04009700, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -833,34 +833,34 @@ Gfx d_course_rainbow_road_packed_dl_1758[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04009740, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(8, 10, 11, 9, 0),
-    gsSP1Quadrangle(10, 12, 13, 11, 0),
-    gsSP1Quadrangle(12, 14, 15, 13, 0),
-    gsSP1Quadrangle(16, 0, 3, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(20, 22, 23, 21, 0),
-    gsSP1Quadrangle(22, 24, 25, 23, 0),
-    gsSP1Quadrangle(24, 26, 27, 25, 0),
-    gsSP1Quadrangle(28, 29, 16, 17, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0),
+    gsSP2Triangles(10, 12, 13, 0, 10, 13, 11, 0),
+    gsSP2Triangles(12, 14, 15, 0, 12, 15, 13, 0),
+    gsSP2Triangles(16, 0, 3, 0, 16, 3, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0),
+    gsSP2Triangles(22, 24, 25, 0, 22, 25, 23, 0),
+    gsSP2Triangles(24, 26, 27, 0, 24, 27, 25, 0),
+    gsSP2Triangles(28, 29, 16, 0, 28, 16, 17, 0),
     gsSPVertex(0x04009920, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(8, 10, 11, 9, 0),
-    gsSP1Quadrangle(10, 12, 13, 11, 0),
-    gsSP1Quadrangle(12, 14, 15, 13, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(17, 20, 21, 18, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 22, 25, 27, 0),
-    gsSP1Quadrangle(4, 28, 29, 5, 0),
-    gsSP1Quadrangle(28, 30, 31, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0),
+    gsSP2Triangles(10, 12, 13, 0, 10, 13, 11, 0),
+    gsSP2Triangles(12, 14, 15, 0, 12, 15, 13, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(17, 20, 21, 0, 17, 21, 18, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 22, 25, 0, 26, 25, 27, 0),
+    gsSP2Triangles(4, 28, 29, 0, 4, 29, 5, 0),
+    gsSP2Triangles(28, 30, 31, 0, 28, 31, 29, 0),
     gsSPVertex(0x04009B20, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -876,7 +876,7 @@ Gfx d_course_rainbow_road_packed_dl_1850[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04009B80, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 6, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x007C),
@@ -886,22 +886,22 @@ Gfx d_course_rainbow_road_packed_dl_1850[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04009BC0, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(22, 24, 25, 23, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(22, 24, 25, 0, 22, 25, 23, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPVertex(0x04009DA0, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(8, 10, 11, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 13, 12, 0),
-    gsSP1Quadrangle(18, 19, 7, 6, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 13, 0, 16, 13, 12, 0),
+    gsSP2Triangles(18, 19, 7, 0, 18, 7, 6, 0),
     gsSPEndDisplayList(),
 };
 
@@ -909,24 +909,24 @@ Gfx d_course_rainbow_road_packed_dl_1978[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x04009EE0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(11, 10, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(16, 18, 19, 17, 0),
-    gsSP1Quadrangle(20, 21, 15, 14, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
-    gsSP1Quadrangle(25, 24, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(11, 10, 12, 0, 11, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(16, 18, 19, 0, 16, 19, 17, 0),
+    gsSP2Triangles(20, 21, 15, 0, 20, 15, 14, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
+    gsSP2Triangles(25, 24, 30, 0, 25, 30, 31, 0),
     gsSPVertex(0x0400A0E0, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 0, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 6, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 0, 0, 4, 0, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 6, 0, 10, 6, 9, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -937,33 +937,33 @@ Gfx d_course_rainbow_road_packed_dl_1A20[] =
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(6, 7, 8, 0, 9, 10, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
     gsSP2Triangles(22, 0, 2, 0, 23, 3, 5, 0),
     gsSP2Triangles(6, 8, 24, 0, 9, 11, 25, 0),
     gsSP2Triangles(26, 12, 14, 0, 27, 15, 17, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0400A460, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(22, 24, 25, 23, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(22, 24, 25, 0, 22, 25, 23, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPVertex(0x0400A640, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 5, 4, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 5, 0, 8, 5, 4, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPVertex(0x0400A820, 10, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 1, 0, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsSPEndDisplayList(),
 };
 
@@ -971,22 +971,22 @@ Gfx d_course_rainbow_road_packed_dl_1B28[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x0400A8C0, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(19, 18, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(19, 18, 20, 0, 19, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPVertex(0x0400AAA0, 28, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSPEndDisplayList(),
 };
 
@@ -999,20 +999,20 @@ Gfx d_course_rainbow_road_packed_dl_1BC0[] =
     gsSP2Triangles(12, 13, 14, 0, 13, 15, 14, 0),
     gsSP2Triangles(0, 2, 16, 0, 17, 3, 5, 0),
     gsSP2Triangles(18, 6, 8, 0, 9, 11, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0400AE60, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(10, 12, 13, 11, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(10, 12, 13, 0, 10, 13, 11, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPVertex(0x0400B040, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1020,27 +1020,27 @@ Gfx d_course_rainbow_road_packed_dl_1C70[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x0400B080, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(7, 10, 11, 8, 0),
-    gsSP1Quadrangle(10, 12, 13, 11, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 14, 17, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(22, 24, 25, 23, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
-    gsSP1Quadrangle(28, 18, 19, 29, 0),
-    gsSP1Quadrangle(12, 30, 31, 13, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(7, 10, 11, 0, 7, 11, 8, 0),
+    gsSP2Triangles(10, 12, 13, 0, 10, 13, 11, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 14, 17, 0, 18, 17, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(22, 24, 25, 0, 22, 25, 23, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
+    gsSP2Triangles(28, 18, 19, 0, 28, 19, 29, 0),
+    gsSP2Triangles(12, 30, 31, 0, 12, 31, 13, 0),
     gsSPVertex(0x0400B280, 28, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(6, 8, 9, 7, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(15, 18, 19, 16, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(6, 8, 9, 0, 6, 9, 7, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(15, 18, 19, 0, 15, 19, 16, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1048,15 +1048,15 @@ Gfx d_course_rainbow_road_packed_dl_1D30[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x0400B440, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 12, 0),
-    gsSP1Quadrangle(19, 20, 21, 22, 0),
-    gsSP1Quadrangle(23, 24, 19, 22, 0),
-    gsSP1Quadrangle(25, 26, 27, 28, 0),
-    gsSP1Quadrangle(27, 29, 30, 28, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 12, 0),
+    gsSP2Triangles(19, 20, 21, 0, 19, 21, 22, 0),
+    gsSP2Triangles(23, 24, 19, 0, 23, 19, 22, 0),
+    gsSP2Triangles(25, 26, 27, 0, 25, 27, 28, 0),
+    gsSP2Triangles(27, 29, 30, 0, 27, 30, 28, 0),
     gsSP1Triangle(21, 20, 31, 0),
     gsSPVertex(0x0400B640, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 4, 0),
@@ -1106,21 +1106,21 @@ Gfx d_course_rainbow_road_packed_dl_1E80[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400B930, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(0, 4, 5, 0, 0, 6, 1, 0),
     gsSP2Triangles(0, 3, 4, 0, 3, 7, 4, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSP2Triangles(2, 24, 3, 0, 1, 25, 2, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPVertex(0x0400BB10, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -1147,23 +1147,23 @@ Gfx d_course_rainbow_road_packed_dl_1FC8[] =
 {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsSPVertex(0x0400BCF0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0400BEF0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1177,12 +1177,12 @@ Gfx d_course_rainbow_road_packed_dl_2078[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x0400C0F0, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
diff --git a/courses/special_cup/yoshi_valley/course_data.inc.c b/courses/special_cup/yoshi_valley/course_data.inc.c
index c7f1d55a2..db6bd290a 100644
--- a/courses/special_cup/yoshi_valley/course_data.inc.c
+++ b/courses/special_cup/yoshi_valley/course_data.inc.c
@@ -10670,7 +10670,7 @@ Vtx d_course_yoshi_valley_flag_2_model[] = {
 Gfx d_course_yoshi_valley_dl_144A8[] =
 {
     gsSPVertex(d_course_yoshi_valley_flag_2_model, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -10706,7 +10706,7 @@ Gfx d_course_yoshi_valley_dl_14558[] =
     gsDPPipeSync(),
     gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
     gsSPVertex(d_course_yoshi_valley_flag_4_model, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -11020,7 +11020,7 @@ Gfx d_course_yoshi_valley_dl_tree[] =
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x00FC),
     gsDPLoadTextureBlock(0x03009000, G_IM_FMT_CI, G_IM_SIZ_8b, 32, 64, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD),
     gsSPVertex(d_course_yoshi_valley_tree_model, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPEndDisplayList(),
 };
@@ -11229,7 +11229,7 @@ Gfx d_course_yoshi_valley_dl_16D70[] =
     gsSP1Triangle(19, 29, 20, 0),
     gsSPVertex(d_course_yoshi_valley_egg_model2, 31, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsSP2Triangles(9, 8, 10, 0, 11, 12, 0, 0),
     gsSP2Triangles(13, 14, 15, 0, 16, 17, 4, 0),
     gsSP2Triangles(18, 19, 20, 0, 19, 21, 22, 0),
@@ -11237,7 +11237,7 @@ Gfx d_course_yoshi_valley_dl_16D70[] =
     gsSP2Triangles(26, 23, 27, 0, 23, 25, 27, 0),
     gsSP1Triangle(28, 29, 30, 0),
     gsSPVertex(d_course_yoshi_valley_egg_model3, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 6, 5, 7, 0),
     gsSP2Triangles(4, 8, 5, 0, 9, 10, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 15, 16, 17, 0),
@@ -11257,9 +11257,9 @@ Gfx d_course_yoshi_valley_dl_16D70[] =
     gsSP2Triangles(27, 28, 25, 0, 29, 30, 31, 0),
     gsSPVertex(d_course_yoshi_valley_egg_model5, 26, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(4, 6, 7, 5, 0),
+    gsSP2Triangles(4, 6, 7, 0, 4, 7, 5, 0),
     gsSP2Triangles(8, 9, 10, 0, 11, 12, 13, 0),
-    gsSP1Quadrangle(12, 14, 15, 13, 0),
+    gsSP2Triangles(12, 14, 15, 0, 12, 15, 13, 0),
     gsSP2Triangles(16, 17, 18, 0, 17, 19, 18, 0),
     gsSP2Triangles(18, 19, 20, 0, 21, 22, 23, 0),
     gsSP1Triangle(22, 24, 25, 0),
diff --git a/courses/special_cup/yoshi_valley/packed.inc.c b/courses/special_cup/yoshi_valley/packed.inc.c
index 232d61c09..538896843 100644
--- a/courses/special_cup/yoshi_valley/packed.inc.c
+++ b/courses/special_cup/yoshi_valley/packed.inc.c
@@ -18,16 +18,16 @@ Gfx d_course_yoshi_valley_packed_dl_0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000000, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04000200, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -43,11 +43,11 @@ Gfx d_course_yoshi_valley_packed_dl_A8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000240, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -63,11 +63,11 @@ Gfx d_course_yoshi_valley_packed_dl_128[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000380, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -83,14 +83,14 @@ Gfx d_course_yoshi_valley_packed_dl_1A8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040004C0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -106,20 +106,20 @@ Gfx d_course_yoshi_valley_packed_dl_240[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040006C0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x040008C0, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -135,11 +135,11 @@ Gfx d_course_yoshi_valley_packed_dl_308[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000A00, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -155,11 +155,11 @@ Gfx d_course_yoshi_valley_packed_dl_388[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000B40, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -175,12 +175,12 @@ Gfx d_course_yoshi_valley_packed_dl_408[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000C80, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -196,13 +196,13 @@ Gfx d_course_yoshi_valley_packed_dl_490[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000E00, 28, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSPEndDisplayList(),
 };
 
@@ -218,10 +218,10 @@ Gfx d_course_yoshi_valley_packed_dl_520[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000FC0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -237,13 +237,13 @@ Gfx d_course_yoshi_valley_packed_dl_598[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040010C0, 28, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSPEndDisplayList(),
 };
 
@@ -259,10 +259,10 @@ Gfx d_course_yoshi_valley_packed_dl_628[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04001280, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -278,16 +278,16 @@ Gfx d_course_yoshi_valley_packed_dl_6A0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04001380, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04001580, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -303,13 +303,13 @@ Gfx d_course_yoshi_valley_packed_dl_748[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040015C0, 28, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSPEndDisplayList(),
 };
 
@@ -325,11 +325,11 @@ Gfx d_course_yoshi_valley_packed_dl_7D8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04001780, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -345,17 +345,17 @@ Gfx d_course_yoshi_valley_packed_dl_858[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040018C0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04001AC0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -371,10 +371,10 @@ Gfx d_course_yoshi_valley_packed_dl_908[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04001B40, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -390,11 +390,11 @@ Gfx d_course_yoshi_valley_packed_dl_980[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04001C40, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -410,17 +410,17 @@ Gfx d_course_yoshi_valley_packed_dl_A00[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04001D80, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04001F80, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -436,13 +436,13 @@ Gfx d_course_yoshi_valley_packed_dl_AB0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04002000, 22, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 6, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(14, 16, 17, 15, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 6, 0, 10, 6, 9, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(14, 16, 17, 0, 14, 17, 15, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
     gsSPEndDisplayList(),
 };
 
@@ -458,18 +458,18 @@ Gfx d_course_yoshi_valley_packed_dl_B40[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04002160, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04002360, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -485,14 +485,14 @@ Gfx d_course_yoshi_valley_packed_dl_BF8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04002420, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -508,13 +508,13 @@ Gfx d_course_yoshi_valley_packed_dl_C90[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04002620, 28, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSPEndDisplayList(),
 };
 
@@ -558,7 +558,7 @@ Gfx d_course_yoshi_valley_packed_dl_DE0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040027E0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 6, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x007C),
@@ -568,7 +568,7 @@ Gfx d_course_yoshi_valley_packed_dl_DE0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04002820, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -584,7 +584,7 @@ Gfx d_course_yoshi_valley_packed_dl_E90[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04002860, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 6, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x007C),
@@ -594,7 +594,7 @@ Gfx d_course_yoshi_valley_packed_dl_E90[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040028A0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -610,7 +610,7 @@ Gfx d_course_yoshi_valley_packed_dl_F40[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040028E0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 6, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x007C),
@@ -620,7 +620,7 @@ Gfx d_course_yoshi_valley_packed_dl_F40[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04002920, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -636,7 +636,7 @@ Gfx d_course_yoshi_valley_packed_dl_FF0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04002960, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 6, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x007C),
@@ -646,7 +646,7 @@ Gfx d_course_yoshi_valley_packed_dl_FF0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040029A0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -671,12 +671,12 @@ Gfx d_course_yoshi_valley_packed_dl_10C8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040029E0, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -692,8 +692,8 @@ Gfx d_course_yoshi_valley_packed_dl_1150[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04002B60, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -709,8 +709,8 @@ Gfx d_course_yoshi_valley_packed_dl_11B8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04002BE0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -726,9 +726,9 @@ Gfx d_course_yoshi_valley_packed_dl_1220[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04002C60, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -744,9 +744,9 @@ Gfx d_course_yoshi_valley_packed_dl_1290[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04002D20, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -762,8 +762,8 @@ Gfx d_course_yoshi_valley_packed_dl_1300[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04002DE0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -779,9 +779,9 @@ Gfx d_course_yoshi_valley_packed_dl_1368[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04002E60, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -809,14 +809,14 @@ Gfx d_course_yoshi_valley_packed_dl_1418[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04002F20, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 0, 3, 5, 0),
-    gsSP1Quadrangle(1, 6, 7, 2, 0),
-    gsSP1Quadrangle(8, 4, 5, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(11, 14, 15, 12, 0),
-    gsSP1Quadrangle(14, 16, 17, 15, 0),
-    gsSP1Quadrangle(16, 18, 19, 17, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 0, 3, 0, 4, 3, 5, 0),
+    gsSP2Triangles(1, 6, 7, 0, 1, 7, 2, 0),
+    gsSP2Triangles(8, 4, 5, 0, 8, 5, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(11, 14, 15, 0, 11, 15, 12, 0),
+    gsSP2Triangles(14, 16, 17, 0, 14, 17, 15, 0),
+    gsSP2Triangles(16, 18, 19, 0, 16, 19, 17, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -826,23 +826,23 @@ Gfx d_course_yoshi_valley_packed_dl_1418[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04003060, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04003260, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -858,14 +858,14 @@ Gfx d_course_yoshi_valley_packed_dl_1580[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04003460, 18, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 0, 3, 5, 0),
-    gsSP1Quadrangle(1, 6, 7, 2, 0),
-    gsSP1Quadrangle(8, 4, 5, 9, 0),
-    gsSP1Quadrangle(6, 10, 11, 7, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(13, 8, 9, 14, 0),
-    gsSP1Quadrangle(16, 12, 15, 17, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 0, 3, 0, 4, 3, 5, 0),
+    gsSP2Triangles(1, 6, 7, 0, 1, 7, 2, 0),
+    gsSP2Triangles(8, 4, 5, 0, 8, 5, 9, 0),
+    gsSP2Triangles(6, 10, 11, 0, 6, 11, 7, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(13, 8, 9, 0, 13, 9, 14, 0),
+    gsSP2Triangles(16, 12, 15, 0, 16, 15, 17, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -875,23 +875,23 @@ Gfx d_course_yoshi_valley_packed_dl_1580[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04003580, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04003780, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -948,7 +948,7 @@ Gfx d_course_yoshi_valley_packed_dl_17B0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04003A10, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(3, 4, 5, 0, 3, 6, 7, 0),
     gsSP2Triangles(3, 5, 6, 0, 7, 6, 8, 0),
     gsSP2Triangles(7, 8, 9, 0, 9, 8, 10, 0),
@@ -1009,7 +1009,7 @@ Gfx d_course_yoshi_valley_packed_dl_1938[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04003C70, 28, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 2, 5, 0, 2, 6, 5, 0),
     gsSP2Triangles(2, 1, 6, 0, 0, 7, 1, 0),
     gsSP2Triangles(4, 5, 8, 0, 9, 10, 4, 0),
@@ -1021,7 +1021,7 @@ Gfx d_course_yoshi_valley_packed_dl_1938[] =
     gsSP2Triangles(15, 20, 21, 0, 15, 13, 20, 0),
     gsSP2Triangles(15, 21, 22, 0, 0, 3, 15, 0),
     gsSP2Triangles(15, 3, 14, 0, 15, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1058,7 +1058,7 @@ Gfx d_course_yoshi_valley_packed_dl_1A68[] =
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
     gsSP2Triangles(2, 4, 0, 0, 0, 5, 3, 0),
     gsSP2Triangles(0, 6, 5, 0, 0, 7, 6, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 8, 15, 16, 0),
     gsSP1Triangle(8, 11, 15, 0),
     gsSPEndDisplayList(),
@@ -1127,8 +1127,8 @@ Gfx d_course_yoshi_valley_packed_dl_1C18[] =
     gsSP2Triangles(6, 7, 8, 0, 8, 7, 9, 0),
     gsSP2Triangles(7, 10, 9, 0, 9, 10, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 12, 15, 13, 0),
-    gsSP1Quadrangle(14, 13, 4, 0, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(14, 13, 4, 0, 14, 4, 0, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1163,10 +1163,10 @@ Gfx d_course_yoshi_valley_packed_dl_1D20[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04004380, 29, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(3, 5, 6, 7, 0),
+    gsSP2Triangles(3, 5, 6, 0, 3, 6, 7, 0),
     gsSP2Triangles(6, 8, 7, 0, 3, 7, 9, 0),
     gsSP2Triangles(3, 9, 10, 0, 9, 7, 11, 0),
-    gsSP1Quadrangle(4, 12, 13, 14, 0),
+    gsSP2Triangles(4, 12, 13, 0, 4, 13, 14, 0),
     gsSP2Triangles(4, 14, 5, 0, 13, 9, 15, 0),
     gsSP2Triangles(9, 11, 15, 0, 13, 15, 16, 0),
     gsSP2Triangles(14, 13, 16, 0, 17, 18, 4, 0),
@@ -1225,7 +1225,7 @@ Gfx d_course_yoshi_valley_packed_dl_1EB8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04004610, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(3, 2, 4, 0, 2, 5, 4, 0),
     gsSPEndDisplayList(),
 };
@@ -1242,7 +1242,7 @@ Gfx d_course_yoshi_valley_packed_dl_1F20[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04004670, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1259,7 +1259,7 @@ Gfx d_course_yoshi_valley_packed_dl_1F80[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040046B0, 8, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
-    gsSP1Quadrangle(2, 3, 4, 5, 0),
+    gsSP2Triangles(2, 3, 4, 0, 2, 4, 5, 0),
     gsSP2Triangles(5, 4, 6, 0, 4, 7, 6, 0),
     gsSPEndDisplayList(),
 };
@@ -1276,7 +1276,7 @@ Gfx d_course_yoshi_valley_packed_dl_1FF0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04004730, 17, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(3, 2, 4, 0, 5, 3, 4, 0),
     gsSP2Triangles(6, 4, 7, 0, 8, 6, 7, 0),
     gsSP2Triangles(6, 5, 4, 0, 9, 10, 11, 0),
@@ -1339,7 +1339,7 @@ Gfx d_course_yoshi_valley_packed_dl_2188[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04004A00, 7, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(2, 4, 3, 0, 4, 5, 3, 0),
     gsSP1Triangle(4, 6, 5, 0),
     gsSPEndDisplayList(),
@@ -1461,9 +1461,9 @@ Gfx d_course_yoshi_valley_packed_dl_2498[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04004EB0, 10, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
-    gsSP1Quadrangle(3, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
+    gsSP2Triangles(3, 5, 6, 0, 3, 6, 7, 0),
     gsSP2Triangles(7, 8, 9, 0, 7, 6, 8, 0),
     gsSPEndDisplayList(),
 };
@@ -1481,9 +1481,9 @@ Gfx d_course_yoshi_valley_packed_dl_2510[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04004F50, 18, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
-    gsSP1Quadrangle(0, 4, 5, 3, 0),
+    gsSP2Triangles(0, 4, 5, 0, 0, 5, 3, 0),
     gsSP2Triangles(4, 6, 5, 0, 6, 7, 5, 0),
-    gsSP1Quadrangle(7, 8, 9, 5, 0),
+    gsSP2Triangles(7, 8, 9, 0, 7, 9, 5, 0),
     gsSP2Triangles(10, 9, 11, 0, 11, 9, 8, 0),
     gsSP2Triangles(12, 13, 14, 0, 12, 15, 13, 0),
     gsSP2Triangles(12, 16, 15, 0, 2, 1, 17, 0),
@@ -1527,9 +1527,9 @@ Gfx d_course_yoshi_valley_packed_dl_2648[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040051C0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(0, 3, 4, 0, 4, 3, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsSP2Triangles(10, 1, 0, 0, 10, 11, 1, 0),
     gsSP2Triangles(9, 11, 10, 0, 9, 8, 11, 0),
     gsSPEndDisplayList(),
@@ -1547,11 +1547,11 @@ Gfx d_course_yoshi_valley_packed_dl_26C8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04005280, 15, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
     gsSP2Triangles(5, 4, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(7, 9, 10, 0, 7, 11, 12, 0),
-    gsSP1Quadrangle(7, 12, 13, 8, 0),
+    gsSP2Triangles(7, 12, 13, 0, 7, 13, 8, 0),
     gsSP2Triangles(5, 11, 7, 0, 5, 14, 11, 0),
     gsSP1Triangle(5, 6, 14, 0),
     gsSPEndDisplayList(),
@@ -1571,11 +1571,11 @@ Gfx d_course_yoshi_valley_packed_dl_2758[] =
     gsSPVertex(0x04005370, 20, 0),
     gsSP2Triangles(0, 1, 2, 0, 2, 3, 4, 0),
     gsSP2Triangles(2, 1, 3, 0, 0, 5, 1, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 0, 0),
-    gsSP1Quadrangle(0, 12, 13, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 0, 0),
+    gsSP2Triangles(0, 12, 13, 0, 0, 13, 5, 0),
     gsSP2Triangles(6, 14, 15, 0, 6, 9, 14, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSP2Triangles(16, 19, 10, 0, 10, 19, 11, 0),
     gsSPEndDisplayList(),
 };
@@ -1616,7 +1616,7 @@ Gfx d_course_yoshi_valley_packed_dl_2868[] =
     gsSP2Triangles(7, 10, 11, 0, 7, 12, 10, 0),
     gsSP2Triangles(7, 9, 12, 0, 11, 10, 13, 0),
     gsSP2Triangles(14, 15, 16, 0, 14, 17, 15, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
     gsSP1Triangle(22, 23, 24, 0),
     gsSPEndDisplayList(),
 };
@@ -1637,7 +1637,7 @@ Gfx d_course_yoshi_valley_packed_dl_28F8[] =
     gsSP2Triangles(6, 4, 3, 0, 6, 7, 4, 0),
     gsSP2Triangles(6, 8, 7, 0, 9, 10, 11, 0),
     gsSP2Triangles(11, 10, 12, 0, 9, 13, 10, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
     gsSP2Triangles(0, 18, 19, 0, 19, 18, 20, 0),
     gsSP2Triangles(0, 2, 18, 0, 9, 21, 13, 0),
     gsSPEndDisplayList(),
@@ -1657,7 +1657,7 @@ Gfx d_course_yoshi_valley_packed_dl_2988[] =
     gsSPVertex(0x04005840, 10, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(3, 5, 0, 0, 3, 6, 4, 0),
-    gsSP1Quadrangle(0, 5, 7, 1, 0),
+    gsSP2Triangles(0, 5, 7, 0, 0, 7, 1, 0),
     gsSP2Triangles(8, 6, 3, 0, 8, 9, 6, 0),
     gsSPEndDisplayList(),
 };
@@ -1674,9 +1674,9 @@ Gfx d_course_yoshi_valley_packed_dl_2A00[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040058E0, 17, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 5, 4, 0),
-    gsSP1Quadrangle(3, 2, 8, 9, 0),
+    gsSP2Triangles(3, 2, 8, 0, 3, 8, 9, 0),
     gsSP2Triangles(5, 10, 6, 0, 7, 11, 5, 0),
     gsSP2Triangles(10, 12, 6, 0, 9, 8, 13, 0),
     gsSP2Triangles(9, 13, 14, 0, 14, 15, 16, 0),
@@ -1715,12 +1715,12 @@ Gfx d_course_yoshi_valley_packed_dl_2B08[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04005A80, 18, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(3, 2, 4, 0, 5, 6, 1, 0),
     gsSP2Triangles(7, 6, 5, 0, 5, 1, 0, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(9, 12, 13, 10, 0),
-    gsSP1Quadrangle(11, 10, 14, 15, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(9, 12, 13, 0, 9, 13, 10, 0),
+    gsSP2Triangles(11, 10, 14, 0, 11, 14, 15, 0),
     gsSP2Triangles(11, 15, 16, 0, 16, 15, 7, 0),
     gsSP2Triangles(15, 17, 7, 0, 7, 17, 6, 0),
     gsSPEndDisplayList(),
@@ -1742,7 +1742,7 @@ Gfx d_course_yoshi_valley_packed_dl_2BA0[] =
     gsSP2Triangles(3, 1, 4, 0, 5, 6, 7, 0),
     gsSP2Triangles(5, 7, 8, 0, 5, 9, 6, 0),
     gsSP2Triangles(8, 7, 10, 0, 7, 11, 10, 0),
-    gsSP1Quadrangle(11, 12, 10, 10, 0),
+    gsSP2Triangles(11, 12, 10, 0, 11, 10, 10, 0),
     gsSP2Triangles(13, 9, 5, 0, 13, 14, 9, 0),
     gsSP2Triangles(13, 4, 14, 0, 4, 13, 3, 0),
     gsSPEndDisplayList(),
@@ -1761,8 +1761,8 @@ Gfx d_course_yoshi_valley_packed_dl_2C30[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04005C90, 19, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
-    gsSP1Quadrangle(2, 1, 4, 5, 0),
-    gsSP1Quadrangle(5, 4, 6, 7, 0),
+    gsSP2Triangles(2, 1, 4, 0, 2, 4, 5, 0),
+    gsSP2Triangles(5, 4, 6, 0, 5, 6, 7, 0),
     gsSP2Triangles(5, 7, 8, 0, 0, 9, 3, 0),
     gsSP2Triangles(7, 6, 10, 0, 11, 12, 13, 0),
     gsSP2Triangles(12, 14, 13, 0, 6, 14, 10, 0),
@@ -1786,7 +1786,7 @@ Gfx d_course_yoshi_valley_packed_dl_2CD0[] =
     gsSPVertex(0x04005DC0, 12, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
     gsSP2Triangles(2, 4, 5, 0, 2, 1, 4, 0),
-    gsSP1Quadrangle(5, 4, 6, 7, 0),
+    gsSP2Triangles(5, 4, 6, 0, 5, 6, 7, 0),
     gsSP2Triangles(7, 6, 8, 0, 9, 10, 11, 0),
     gsSP2Triangles(9, 8, 10, 0, 7, 8, 9, 0),
     gsSPEndDisplayList(),
@@ -1804,11 +1804,11 @@ Gfx d_course_yoshi_valley_packed_dl_2D50[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04005E80, 14, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(3, 2, 4, 0, 5, 6, 7, 0),
-    gsSP1Quadrangle(6, 8, 9, 7, 0),
-    gsSP1Quadrangle(5, 7, 10, 11, 0),
-    gsSP1Quadrangle(11, 10, 12, 13, 0),
+    gsSP2Triangles(6, 8, 9, 0, 6, 9, 7, 0),
+    gsSP2Triangles(5, 7, 10, 0, 5, 10, 11, 0),
+    gsSP2Triangles(11, 10, 12, 0, 11, 12, 13, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1845,8 +1845,8 @@ Gfx d_course_yoshi_valley_packed_dl_2E58[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04006020, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 1, 0, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0),
     gsSP2Triangles(0, 6, 7, 0, 3, 6, 0, 0),
     gsSP2Triangles(3, 8, 6, 0, 3, 9, 8, 0),
     gsSP2Triangles(0, 7, 10, 0, 4, 10, 11, 0),
@@ -1871,9 +1871,9 @@ Gfx d_course_yoshi_valley_packed_dl_2EE0[] =
     gsSP2Triangles(2, 7, 5, 0, 6, 8, 9, 0),
     gsSP2Triangles(6, 9, 2, 0, 2, 9, 10, 0),
     gsSP2Triangles(2, 10, 4, 0, 2, 3, 7, 0),
-    gsSP1Quadrangle(11, 12, 13, 14, 0),
-    gsSP1Quadrangle(14, 15, 16, 11, 0),
-    gsSP1Quadrangle(11, 16, 8, 6, 0),
+    gsSP2Triangles(11, 12, 13, 0, 11, 13, 14, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 11, 0),
+    gsSP2Triangles(11, 16, 8, 0, 11, 8, 6, 0),
     gsSP2Triangles(6, 12, 11, 0, 6, 5, 12, 0),
     gsSP2Triangles(4, 17, 0, 0, 4, 18, 19, 0),
     gsSP2Triangles(14, 13, 20, 0, 4, 19, 17, 0),
@@ -2057,15 +2057,15 @@ Gfx d_course_yoshi_valley_packed_dl_33D8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040066E0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05003000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04006760, 17, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(0, 4, 1, 0, 5, 6, 7, 0),
     gsSP2Triangles(7, 6, 8, 0, 9, 10, 11, 0),
     gsSP2Triangles(10, 12, 11, 0, 13, 14, 15, 0),
@@ -2085,15 +2085,15 @@ Gfx d_course_yoshi_valley_packed_dl_3498[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04006870, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 1, 0, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 1, 0, 3, 1, 0, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05002000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040068B0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05003000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
@@ -2101,8 +2101,8 @@ Gfx d_course_yoshi_valley_packed_dl_3498[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040068F0, 14, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2118,8 +2118,8 @@ Gfx d_course_yoshi_valley_packed_dl_3580[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040069D0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 1, 0, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 1, 0, 3, 1, 0, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05003000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
@@ -2180,7 +2180,7 @@ Gfx d_course_yoshi_valley_packed_dl_3710[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04006C00, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05003000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
@@ -2223,8 +2223,8 @@ Gfx d_course_yoshi_valley_packed_dl_3818[] =
     gsSPVertex(0x04006D40, 16, 0),
     gsSP2Triangles(0, 1, 2, 0, 2, 1, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 5, 7, 6, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2298,9 +2298,9 @@ Gfx d_course_yoshi_valley_packed_dl_3A00[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040070F0, 15, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(6, 8, 9, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(6, 8, 9, 0, 6, 9, 7, 0),
     gsSP2Triangles(10, 11, 12, 0, 11, 13, 14, 0),
     gsSP1Triangle(11, 14, 12, 0),
     gsSPEndDisplayList(),
@@ -2318,7 +2318,7 @@ Gfx d_course_yoshi_valley_packed_dl_3A80[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040071E0, 15, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 6, 7, 4, 0),
     gsSP2Triangles(8, 9, 10, 0, 9, 11, 10, 0),
     gsSP2Triangles(10, 11, 12, 0, 13, 8, 10, 0),
@@ -2360,7 +2360,7 @@ Gfx d_course_yoshi_valley_packed_dl_3B78[] =
     gsSP2Triangles(0, 1, 2, 0, 1, 0, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 5, 4, 0),
     gsSP2Triangles(8, 9, 10, 0, 9, 11, 10, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 16, 19, 17, 0),
     gsSPEndDisplayList(),
 };
@@ -2377,10 +2377,10 @@ Gfx d_course_yoshi_valley_packed_dl_3BF8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04007490, 14, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 5, 4, 7, 0),
     gsSP2Triangles(5, 7, 8, 0, 9, 10, 11, 0),
-    gsSP1Quadrangle(10, 12, 13, 11, 0),
+    gsSP2Triangles(10, 12, 13, 0, 10, 13, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2459,23 +2459,23 @@ Gfx d_course_yoshi_valley_packed_dl_3E08[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04007660, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05003000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040076A0, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(8, 10, 11, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(14, 16, 17, 15, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(20, 22, 23, 21, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(26, 28, 29, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(14, 16, 17, 0, 14, 17, 15, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(26, 28, 29, 0, 26, 29, 27, 0),
     gsSPVertex(0x04007880, 12, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
     gsSP2Triangles(1, 4, 3, 0, 3, 5, 6, 0),
@@ -2496,7 +2496,7 @@ Gfx d_course_yoshi_valley_packed_dl_3F10[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04007940, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05003000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
@@ -2528,8 +2528,8 @@ Gfx d_course_yoshi_valley_packed_dl_3FF0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04007B50, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05003000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
@@ -2542,16 +2542,16 @@ Gfx d_course_yoshi_valley_packed_dl_3FF0[] =
     gsSP2Triangles(7, 9, 10, 0, 8, 11, 12, 0),
     gsSP2Triangles(8, 12, 9, 0, 13, 14, 15, 0),
     gsSP2Triangles(13, 16, 14, 0, 14, 17, 15, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
     gsSP2Triangles(22, 23, 20, 0, 20, 23, 21, 0),
     gsSP2Triangles(19, 22, 20, 0, 19, 24, 22, 0),
-    gsSP1Quadrangle(25, 26, 27, 28, 0),
-    gsSP1Quadrangle(29, 30, 25, 28, 0),
+    gsSP2Triangles(25, 26, 27, 0, 25, 27, 28, 0),
+    gsSP2Triangles(29, 30, 25, 0, 29, 25, 28, 0),
     gsSPVertex(0x04007DC0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(8, 10, 11, 9, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2567,16 +2567,16 @@ Gfx d_course_yoshi_valley_packed_dl_4108[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04007E80, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(7, 10, 11, 8, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(14, 16, 17, 15, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(20, 22, 23, 21, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(26, 28, 29, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(7, 10, 11, 0, 7, 11, 8, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(14, 16, 17, 0, 14, 17, 15, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(26, 28, 29, 0, 26, 29, 27, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2592,13 +2592,13 @@ Gfx d_course_yoshi_valley_packed_dl_41B0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04008060, 26, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(8, 10, 11, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(14, 16, 17, 15, 0),
-    gsSP1Quadrangle(18, 19, 15, 17, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(14, 16, 17, 0, 14, 17, 15, 0),
+    gsSP2Triangles(18, 19, 15, 0, 18, 15, 17, 0),
     gsSP2Triangles(19, 12, 15, 0, 20, 21, 22, 0),
     gsSP2Triangles(20, 22, 23, 0, 22, 24, 25, 0),
     gsSP1Triangle(22, 25, 23, 0),
@@ -2617,27 +2617,27 @@ Gfx d_course_yoshi_valley_packed_dl_4258[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04008200, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(8, 10, 11, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 12, 15, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(20, 22, 23, 21, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(26, 28, 29, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 12, 0, 16, 12, 15, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(26, 28, 29, 0, 26, 29, 27, 0),
     gsSPVertex(0x040083E0, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(8, 10, 11, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(14, 16, 17, 15, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 18, 21, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(26, 28, 29, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(14, 16, 17, 0, 14, 17, 15, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 18, 0, 22, 18, 21, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(26, 28, 29, 0, 26, 29, 27, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2653,7 +2653,7 @@ Gfx d_course_yoshi_valley_packed_dl_4358[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040085C0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(1, 4, 2, 0, 5, 6, 7, 0),
     gsSP2Triangles(5, 7, 8, 0, 7, 9, 10, 0),
     gsSP2Triangles(7, 10, 8, 0, 11, 12, 13, 0),
@@ -2684,7 +2684,7 @@ Gfx d_course_yoshi_valley_packed_dl_4428[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04008880, 25, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
-    gsSP1Quadrangle(1, 4, 5, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 3, 0),
     gsSP2Triangles(3, 6, 2, 0, 7, 8, 9, 0),
     gsSP2Triangles(7, 9, 10, 0, 9, 11, 12, 0),
     gsSP2Triangles(9, 12, 10, 0, 13, 14, 15, 0),
@@ -2707,9 +2707,9 @@ Gfx d_course_yoshi_valley_packed_dl_44C8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04008A10, 10, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -2719,7 +2719,7 @@ Gfx d_course_yoshi_valley_packed_dl_44C8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04008AB0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2735,8 +2735,8 @@ Gfx d_course_yoshi_valley_packed_dl_4588[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04008AF0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2752,11 +2752,11 @@ Gfx d_course_yoshi_valley_packed_dl_45F0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04008B70, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2772,9 +2772,9 @@ Gfx d_course_yoshi_valley_packed_dl_4670[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04008CB0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2790,30 +2790,30 @@ Gfx d_course_yoshi_valley_packed_dl_46E0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04008D70, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05002000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04008DF0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05003000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04008E30, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
-    gsSP1Quadrangle(5, 6, 7, 2, 0),
-    gsSP1Quadrangle(2, 7, 8, 3, 0),
-    gsSP1Quadrangle(9, 10, 11, 12, 0),
-    gsSP1Quadrangle(11, 13, 14, 12, 0),
-    gsSP1Quadrangle(15, 16, 17, 18, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
+    gsSP2Triangles(5, 6, 7, 0, 5, 7, 2, 0),
+    gsSP2Triangles(2, 7, 8, 0, 2, 8, 3, 0),
+    gsSP2Triangles(9, 10, 11, 0, 9, 11, 12, 0),
+    gsSP2Triangles(11, 13, 14, 0, 11, 14, 12, 0),
+    gsSP2Triangles(15, 16, 17, 0, 15, 17, 18, 0),
     gsSP2Triangles(17, 19, 18, 0, 16, 20, 21, 0),
-    gsSP1Quadrangle(21, 22, 17, 16, 0),
+    gsSP2Triangles(21, 22, 17, 0, 21, 17, 16, 0),
     gsSP2Triangles(22, 19, 17, 0, 23, 24, 25, 0),
     gsSP2Triangles(24, 26, 25, 0, 24, 27, 28, 0),
     gsSP2Triangles(24, 28, 26, 0, 26, 29, 25, 0),
@@ -2832,15 +2832,15 @@ Gfx d_course_yoshi_valley_packed_dl_4810[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04009010, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05003000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04009090, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(2, 4, 3, 0, 2, 5, 4, 0),
     gsSP2Triangles(4, 6, 3, 0, 7, 8, 9, 0),
     gsSP2Triangles(7, 9, 10, 0, 11, 12, 7, 0),
@@ -2852,8 +2852,8 @@ Gfx d_course_yoshi_valley_packed_dl_4810[] =
     gsSP2Triangles(25, 27, 28, 0, 29, 30, 25, 0),
     gsSP1Triangle(29, 25, 28, 0),
     gsSPVertex(0x04009280, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 0, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 0, 0, 4, 0, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2869,16 +2869,16 @@ Gfx d_course_yoshi_valley_packed_dl_4918[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040092E0, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(8, 10, 11, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(14, 16, 17, 15, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(20, 22, 23, 21, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(26, 28, 29, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(14, 16, 17, 0, 14, 17, 15, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(26, 28, 29, 0, 26, 29, 27, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2917,20 +2917,20 @@ Gfx d_course_yoshi_valley_packed_dl_4A58[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04009630, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(8, 10, 11, 9, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0),
     gsSP2Triangles(12, 13, 14, 0, 12, 15, 13, 0),
     gsSP2Triangles(16, 14, 13, 0, 15, 17, 18, 0),
     gsSP2Triangles(15, 18, 13, 0, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(24, 26, 27, 25, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(24, 26, 27, 0, 24, 27, 25, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04009830, 10, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(6, 8, 9, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(6, 8, 9, 0, 6, 9, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2946,15 +2946,15 @@ Gfx d_course_yoshi_valley_packed_dl_4B20[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040098D0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05003000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04009910, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
     gsSP2Triangles(6, 7, 8, 0, 7, 9, 8, 0),
     gsSP2Triangles(9, 10, 8, 0, 11, 12, 13, 0),
     gsSP2Triangles(11, 13, 14, 0, 13, 15, 16, 0),
@@ -2981,14 +2981,14 @@ Gfx d_course_yoshi_valley_packed_dl_4C18[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04009B60, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 0, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 6, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(14, 16, 17, 15, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(20, 22, 23, 21, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 0, 0, 4, 0, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 6, 0, 10, 6, 9, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(14, 16, 17, 0, 14, 17, 15, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3004,14 +3004,14 @@ Gfx d_course_yoshi_valley_packed_dl_4CB0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04009CE0, 29, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(5, 6, 7, 3, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(9, 12, 13, 10, 0),
-    gsSP1Quadrangle(13, 14, 15, 10, 0),
-    gsSP1Quadrangle(10, 15, 16, 11, 0),
-    gsSP1Quadrangle(7, 17, 0, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(5, 6, 7, 0, 5, 7, 3, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(9, 12, 13, 0, 9, 13, 10, 0),
+    gsSP2Triangles(13, 14, 15, 0, 13, 15, 10, 0),
+    gsSP2Triangles(10, 15, 16, 0, 10, 16, 11, 0),
+    gsSP2Triangles(7, 17, 0, 0, 7, 0, 3, 0),
     gsSP2Triangles(18, 19, 20, 0, 21, 18, 20, 0),
     gsSP2Triangles(19, 22, 20, 0, 23, 24, 25, 0),
     gsSP2Triangles(23, 25, 26, 0, 25, 27, 28, 0),
@@ -3031,31 +3031,31 @@ Gfx d_course_yoshi_valley_packed_dl_4D68[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04009EB0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05003000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04009EF0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(8, 10, 11, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(13, 16, 17, 14, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(13, 16, 17, 0, 13, 17, 14, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
     gsSP2Triangles(20, 22, 21, 0, 23, 24, 25, 0),
     gsSP2Triangles(24, 26, 25, 0, 24, 27, 26, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0400A0F0, 22, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 4, 7, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(12, 14, 15, 13, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(18, 20, 21, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 4, 7, 0, 8, 7, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(12, 14, 15, 0, 12, 15, 13, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(18, 20, 21, 0, 18, 21, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3071,19 +3071,19 @@ Gfx d_course_yoshi_valley_packed_dl_4E88[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400A250, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 0, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(8, 10, 11, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(14, 16, 17, 15, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(20, 22, 23, 21, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(26, 28, 29, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 0, 0, 4, 0, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(14, 16, 17, 0, 14, 17, 15, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(26, 28, 29, 0, 26, 29, 27, 0),
     gsSPVertex(0x0400A430, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3099,12 +3099,12 @@ Gfx d_course_yoshi_valley_packed_dl_4F48[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400A490, 18, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(8, 10, 11, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(13, 16, 17, 14, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(13, 16, 17, 0, 13, 17, 14, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3120,12 +3120,12 @@ Gfx d_course_yoshi_valley_packed_dl_4FD0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400A5B0, 18, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(8, 10, 11, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(14, 16, 17, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(14, 16, 17, 0, 14, 17, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3145,7 +3145,7 @@ Gfx d_course_yoshi_valley_packed_dl_5058[] =
     gsSP2Triangles(2, 1, 4, 0, 5, 6, 2, 0),
     gsSP2Triangles(6, 7, 2, 0, 7, 8, 9, 0),
     gsSP2Triangles(7, 9, 2, 0, 9, 3, 2, 0),
-    gsSP1Quadrangle(10, 5, 2, 11, 0),
+    gsSP2Triangles(10, 5, 2, 0, 10, 2, 11, 0),
     gsSP1Triangle(2, 4, 11, 0),
     gsSPEndDisplayList(),
 };
@@ -3163,9 +3163,9 @@ Gfx d_course_yoshi_valley_packed_dl_50E0[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400A790, 18, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3181,11 +3181,11 @@ Gfx d_course_yoshi_valley_packed_dl_5158[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400A8B0, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3201,27 +3201,27 @@ Gfx d_course_yoshi_valley_packed_dl_51D8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400A9F0, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(8, 10, 11, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 12, 15, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(20, 22, 23, 21, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(26, 28, 29, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 12, 0, 16, 12, 15, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(26, 28, 29, 0, 26, 29, 27, 0),
     gsSPVertex(0x0400ABD0, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(8, 10, 11, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(14, 16, 17, 15, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 18, 21, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(26, 28, 29, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(14, 16, 17, 0, 14, 17, 15, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 18, 0, 22, 18, 21, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(26, 28, 29, 0, 26, 29, 27, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3237,9 +3237,9 @@ Gfx d_course_yoshi_valley_packed_dl_52D8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400ADB0, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsSP2Triangles(7, 10, 8, 0, 11, 12, 13, 0),
     gsSP2Triangles(11, 13, 14, 0, 15, 11, 14, 0),
     gsSP2Triangles(13, 16, 14, 0, 17, 15, 14, 0),
@@ -3249,12 +3249,12 @@ Gfx d_course_yoshi_valley_packed_dl_52D8[] =
     gsSP2Triangles(24, 26, 27, 0, 26, 28, 29, 0),
     gsSP1Triangle(26, 29, 27, 0),
     gsSPVertex(0x0400AF90, 18, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 0, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(8, 10, 11, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(13, 16, 17, 14, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 0, 0, 4, 0, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(13, 16, 17, 0, 13, 17, 14, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3327,7 +3327,7 @@ Gfx d_course_yoshi_valley_packed_dl_5548[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400B1E0, 10, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(2, 4, 3, 0, 5, 6, 4, 0),
     gsSP2Triangles(6, 3, 4, 0, 4, 7, 8, 0),
     gsSP2Triangles(5, 4, 8, 0, 5, 9, 6, 0),
@@ -3419,7 +3419,7 @@ Gfx d_course_yoshi_valley_packed_dl_5788[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400B490, 10, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(3, 4, 0, 0, 0, 5, 6, 0),
     gsSP2Triangles(6, 1, 0, 0, 7, 1, 6, 0),
     gsSP2Triangles(1, 8, 9, 0, 9, 2, 1, 0),
@@ -3496,7 +3496,7 @@ Gfx d_course_yoshi_valley_packed_dl_5970[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400B6E0, 13, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(1, 0, 4, 0, 5, 6, 7, 0),
     gsSP2Triangles(6, 8, 7, 0, 5, 9, 6, 0),
     gsSP2Triangles(10, 7, 8, 0, 7, 10, 11, 0),
@@ -3626,7 +3626,7 @@ Gfx d_course_yoshi_valley_packed_dl_5C80[] =
     gsSP2Triangles(0, 3, 1, 0, 5, 0, 2, 0),
     gsSP2Triangles(1, 6, 2, 0, 2, 7, 8, 0),
     gsSP2Triangles(2, 6, 7, 0, 8, 5, 2, 0),
-    gsSP1Quadrangle(8, 7, 9, 10, 0),
+    gsSP2Triangles(8, 7, 9, 0, 8, 9, 10, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3725,9 +3725,9 @@ Gfx d_course_yoshi_valley_packed_dl_5F10[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400BD50, 10, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
-    gsSP1Quadrangle(2, 3, 4, 5, 0),
+    gsSP2Triangles(2, 3, 4, 0, 2, 4, 5, 0),
     gsSP2Triangles(5, 6, 7, 0, 5, 4, 6, 0),
-    gsSP1Quadrangle(7, 6, 8, 9, 0),
+    gsSP2Triangles(7, 6, 8, 0, 7, 8, 9, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3743,7 +3743,7 @@ Gfx d_course_yoshi_valley_packed_dl_5F88[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400BDF0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 0, 3, 0, 4, 5, 0, 0),
     gsSP2Triangles(2, 1, 6, 0, 6, 7, 2, 0),
     gsSP2Triangles(6, 8, 9, 0, 9, 7, 6, 0),
@@ -3783,10 +3783,10 @@ Gfx d_course_yoshi_valley_packed_dl_6070[] =
     gsSP2Triangles(0, 1, 2, 0, 3, 0, 2, 0),
     gsSP2Triangles(1, 4, 2, 0, 5, 4, 1, 0),
     gsSP2Triangles(6, 3, 2, 0, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 8, 7, 0),
+    gsSP2Triangles(10, 11, 8, 0, 10, 8, 7, 0),
     gsSP2Triangles(8, 12, 9, 0, 9, 12, 5, 0),
     gsSP2Triangles(9, 5, 1, 0, 6, 13, 3, 0),
-    gsSP1Quadrangle(10, 7, 13, 6, 0),
+    gsSP2Triangles(10, 7, 13, 0, 10, 13, 6, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3822,7 +3822,7 @@ Gfx d_course_yoshi_valley_packed_dl_6178[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400C090, 8, 0),
     gsSP2Triangles(0, 1, 2, 0, 2, 3, 0, 0),
-    gsSP1Quadrangle(2, 1, 4, 5, 0),
+    gsSP2Triangles(2, 1, 4, 0, 2, 4, 5, 0),
     gsSP2Triangles(6, 7, 4, 0, 7, 5, 4, 0),
     gsSPEndDisplayList(),
 };
@@ -3931,7 +3931,7 @@ Gfx d_course_yoshi_valley_packed_dl_6428[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400C3B0, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(3, 4, 5, 0, 3, 2, 4, 0),
     gsSPEndDisplayList(),
 };
@@ -4038,7 +4038,7 @@ Gfx d_course_yoshi_valley_packed_dl_66B0[] =
     gsSPVertex(0x0400C650, 9, 0),
     gsSP2Triangles(0, 1, 2, 0, 2, 1, 3, 0),
     gsSP2Triangles(1, 4, 3, 0, 5, 0, 2, 0),
-    gsSP1Quadrangle(0, 5, 6, 7, 0),
+    gsSP2Triangles(0, 5, 6, 0, 0, 6, 7, 0),
     gsSP1Triangle(8, 7, 6, 0),
     gsSPEndDisplayList(),
 };
@@ -4093,7 +4093,7 @@ Gfx d_course_yoshi_valley_packed_dl_6810[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400C800, 10, 0),
     gsSP2Triangles(0, 1, 2, 0, 2, 1, 3, 0),
-    gsSP1Quadrangle(1, 0, 4, 5, 0),
+    gsSP2Triangles(1, 0, 4, 0, 1, 4, 5, 0),
     gsSP2Triangles(6, 7, 4, 0, 4, 7, 5, 0),
     gsSP2Triangles(7, 6, 8, 0, 8, 9, 7, 0),
     gsSPEndDisplayList(),
@@ -4114,7 +4114,7 @@ Gfx d_course_yoshi_valley_packed_dl_6888[] =
     gsSP2Triangles(0, 1, 2, 0, 2, 3, 0, 0),
     gsSP2Triangles(4, 0, 3, 0, 4, 5, 0, 0),
     gsSP2Triangles(1, 6, 7, 0, 7, 2, 1, 0),
-    gsSP1Quadrangle(8, 9, 5, 4, 0),
+    gsSP2Triangles(8, 9, 5, 0, 8, 5, 4, 0),
     gsSP2Triangles(10, 9, 8, 0, 8, 11, 10, 0),
     gsSP2Triangles(12, 7, 6, 0, 13, 14, 15, 0),
     gsSP2Triangles(13, 15, 16, 0, 17, 16, 15, 0),
@@ -4172,12 +4172,12 @@ Gfx d_course_yoshi_valley_packed_dl_6A08[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400CAC0, 18, 0),
     gsSP2Triangles(0, 1, 2, 0, 2, 1, 3, 0),
-    gsSP1Quadrangle(4, 3, 1, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(4, 3, 1, 0, 4, 1, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsSP2Triangles(7, 6, 5, 0, 6, 10, 5, 0),
-    gsSP1Quadrangle(11, 12, 5, 10, 0),
+    gsSP2Triangles(11, 12, 5, 0, 11, 5, 10, 0),
     gsSP2Triangles(12, 13, 5, 0, 13, 4, 5, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4236,7 +4236,7 @@ Gfx d_course_yoshi_valley_packed_dl_6B98[] =
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 5, 4, 0),
     gsSP2Triangles(8, 7, 4, 0, 5, 9, 6, 0),
-    gsSP1Quadrangle(6, 9, 10, 11, 0),
+    gsSP2Triangles(6, 9, 10, 0, 6, 10, 11, 0),
     gsSP2Triangles(6, 11, 12, 0, 12, 11, 13, 0),
     gsSP2Triangles(12, 13, 14, 0, 15, 12, 14, 0),
     gsSP2Triangles(16, 17, 18, 0, 7, 8, 19, 0),
@@ -4277,7 +4277,7 @@ Gfx d_course_yoshi_valley_packed_dl_6CB8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400CF80, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(1, 0, 4, 0, 0, 5, 4, 0),
     gsSP2Triangles(4, 5, 6, 0, 6, 7, 4, 0),
     gsSP2Triangles(7, 6, 8, 0, 6, 9, 8, 0),
@@ -4316,7 +4316,7 @@ Gfx d_course_yoshi_valley_packed_dl_6DB0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400D100, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 2, 0, 5, 3, 2, 0),
     gsSP2Triangles(6, 7, 5, 0, 5, 4, 6, 0),
     gsSPEndDisplayList(),
@@ -4334,7 +4334,7 @@ Gfx d_course_yoshi_valley_packed_dl_6E20[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400D180, 13, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(1, 4, 2, 0, 3, 2, 5, 0),
     gsSP2Triangles(5, 6, 3, 0, 7, 6, 5, 0),
     gsSP2Triangles(8, 7, 5, 0, 9, 10, 11, 0),
@@ -4354,8 +4354,8 @@ Gfx d_course_yoshi_valley_packed_dl_6EA0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400D250, 14, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 2, 2, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 2, 0, 4, 2, 2, 0),
     gsSP2Triangles(1, 4, 2, 0, 6, 7, 1, 0),
     gsSP2Triangles(6, 1, 0, 0, 8, 9, 7, 0),
     gsSP2Triangles(8, 7, 6, 0, 10, 11, 9, 0),
@@ -4412,11 +4412,11 @@ Gfx d_course_yoshi_valley_packed_dl_7010[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400D430, 14, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 1, 0, 0),
-    gsSP1Quadrangle(3, 2, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(11, 10, 12, 13, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0),
+    gsSP2Triangles(3, 2, 6, 0, 3, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(11, 10, 12, 0, 11, 12, 13, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4578,9 +4578,9 @@ Gfx d_course_yoshi_valley_packed_dl_7458[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400D870, 16, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4599,9 +4599,9 @@ Gfx d_course_yoshi_valley_packed_dl_74D0[] =
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
     gsSP2Triangles(4, 0, 2, 0, 5, 6, 7, 0),
     gsSP2Triangles(6, 8, 7, 0, 6, 9, 8, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4617,10 +4617,10 @@ Gfx d_course_yoshi_valley_packed_dl_7558[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0400DAD0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4644,8 +4644,8 @@ Gfx d_course_yoshi_valley_packed_dl_75F0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400DBD0, 7, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
     gsSP1Triangle(4, 6, 5, 0),
     gsSPEndDisplayList(),
 };
@@ -4700,9 +4700,9 @@ Gfx d_course_yoshi_valley_packed_dl_7740[] =
     gsSPVertex(0x0400DD20, 14, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
     gsSP2Triangles(4, 5, 1, 0, 1, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(8, 7, 10, 11, 0),
-    gsSP1Quadrangle(12, 6, 9, 13, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(8, 7, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 6, 9, 0, 12, 9, 13, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4735,12 +4735,12 @@ Gfx d_course_yoshi_valley_packed_dl_7828[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400DE60, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(0, 3, 4, 5, 0),
-    gsSP1Quadrangle(5, 4, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(9, 12, 13, 10, 0),
-    gsSP1Quadrangle(14, 8, 11, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0),
+    gsSP2Triangles(5, 4, 6, 0, 5, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(9, 12, 13, 0, 9, 13, 10, 0),
+    gsSP2Triangles(14, 8, 11, 0, 14, 11, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4757,7 +4757,7 @@ Gfx d_course_yoshi_valley_packed_dl_78B0[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400DF60, 9, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
-    gsSP1Quadrangle(1, 4, 5, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 3, 0),
     gsSP2Triangles(0, 2, 6, 0, 7, 0, 8, 0),
     gsSP1Triangle(8, 0, 6, 0),
     gsSPEndDisplayList(),
@@ -4775,9 +4775,9 @@ Gfx d_course_yoshi_valley_packed_dl_7928[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400DFF0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(0, 4, 5, 1, 0),
-    gsSP1Quadrangle(0, 6, 7, 4, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(0, 4, 5, 0, 0, 5, 1, 0),
+    gsSP2Triangles(0, 6, 7, 0, 0, 7, 4, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4793,9 +4793,9 @@ Gfx d_course_yoshi_valley_packed_dl_7998[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400E070, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
-    gsSP1Quadrangle(4, 6, 7, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
+    gsSP2Triangles(4, 6, 7, 0, 4, 7, 5, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4811,8 +4811,8 @@ Gfx d_course_yoshi_valley_packed_dl_7A08[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400E0F0, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 1, 4, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 1, 4, 0, 2, 4, 5, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4828,7 +4828,7 @@ Gfx d_course_yoshi_valley_packed_dl_7A70[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400E150, 7, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(2, 4, 3, 0, 2, 5, 4, 0),
     gsSP1Triangle(0, 6, 1, 0),
     gsSPEndDisplayList(),
@@ -4864,7 +4864,7 @@ Gfx d_course_yoshi_valley_packed_dl_7B50[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400E230, 13, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(3, 4, 0, 0, 5, 4, 6, 0),
     gsSP2Triangles(0, 4, 5, 0, 7, 8, 9, 0),
     gsSP2Triangles(7, 9, 10, 0, 11, 12, 9, 0),
@@ -4904,7 +4904,7 @@ Gfx d_course_yoshi_valley_packed_dl_7C50[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400E3F0, 7, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(1, 4, 2, 0, 1, 5, 6, 0),
     gsSP1Triangle(1, 6, 4, 0),
     gsSPEndDisplayList(),
@@ -4925,7 +4925,7 @@ Gfx d_course_yoshi_valley_packed_dl_7CC0[] =
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 4, 0),
     gsSP2Triangles(0, 4, 1, 0, 1, 5, 2, 0),
     gsSP2Triangles(2, 5, 6, 0, 6, 5, 7, 0),
-    gsSP1Quadrangle(8, 6, 7, 9, 0),
+    gsSP2Triangles(8, 6, 7, 0, 8, 7, 9, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4941,9 +4941,9 @@ Gfx d_course_yoshi_valley_packed_dl_7D38[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400E500, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 1, 0, 0),
-    gsSP1Quadrangle(6, 7, 5, 4, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0),
+    gsSP2Triangles(6, 7, 5, 0, 6, 5, 4, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4961,7 +4961,7 @@ Gfx d_course_yoshi_valley_packed_dl_7DA8[] =
     gsSPVertex(0x0400E580, 9, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 0, 3, 0),
     gsSP2Triangles(1, 3, 4, 0, 5, 0, 2, 0),
-    gsSP1Quadrangle(4, 3, 6, 7, 0),
+    gsSP2Triangles(4, 3, 6, 0, 4, 6, 7, 0),
     gsSP1Triangle(5, 2, 8, 0),
     gsSPEndDisplayList(),
 };
@@ -5029,9 +5029,9 @@ Gfx d_course_yoshi_valley_packed_dl_7F58[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400E720, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(3, 2, 4, 0, 5, 3, 4, 0),
-    gsSP1Quadrangle(6, 5, 4, 7, 0),
+    gsSP2Triangles(6, 5, 4, 0, 6, 4, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5047,12 +5047,12 @@ Gfx d_course_yoshi_valley_packed_dl_7FC8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400E7A0, 14, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(1, 4, 2, 0, 1, 5, 4, 0),
     gsSP2Triangles(4, 5, 6, 0, 5, 7, 6, 0),
     gsSP2Triangles(0, 3, 8, 0, 3, 9, 8, 0),
-    gsSP1Quadrangle(10, 0, 8, 11, 0),
-    gsSP1Quadrangle(12, 13, 10, 11, 0),
+    gsSP2Triangles(10, 0, 8, 0, 10, 8, 11, 0),
+    gsSP2Triangles(12, 13, 10, 0, 12, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
diff --git a/courses/star_cup/bowsers_castle/course_data.inc.c b/courses/star_cup/bowsers_castle/course_data.inc.c
index 9cbc4a186..fdc24e93e 100644
--- a/courses/star_cup/bowsers_castle/course_data.inc.c
+++ b/courses/star_cup/bowsers_castle/course_data.inc.c
@@ -3899,7 +3899,7 @@ Gfx d_course_bowsers_castle_dl_8F38[] =
     gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
     gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
     gsSPVertex(d_course_bowsers_castle_thwomp_model1, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -3913,25 +3913,25 @@ Gfx d_course_bowsers_castle_dl_8F38[] =
     gsSP2Triangles(6, 7, 8, 0, 9, 10, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 15, 16, 17, 0),
     gsSP2Triangles(18, 19, 20, 0, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(d_course_bowsers_castle_thwomp_model3, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(d_course_bowsers_castle_thwomp_model4, 28, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSPEndDisplayList(),
 };
 
diff --git a/courses/star_cup/bowsers_castle/packed.inc.c b/courses/star_cup/bowsers_castle/packed.inc.c
index a14329553..74fe56e47 100644
--- a/courses/star_cup/bowsers_castle/packed.inc.c
+++ b/courses/star_cup/bowsers_castle/packed.inc.c
@@ -17,7 +17,7 @@ Gfx d_course_bowsers_castle_packed_dl_0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04000000, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -33,7 +33,7 @@ Gfx d_course_bowsers_castle_packed_dl_60[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04000040, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -49,7 +49,7 @@ Gfx d_course_bowsers_castle_packed_dl_C0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04000080, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -65,8 +65,8 @@ Gfx d_course_bowsers_castle_packed_dl_120[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040000C0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -82,7 +82,7 @@ Gfx d_course_bowsers_castle_packed_dl_188[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04000140, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -98,7 +98,7 @@ Gfx d_course_bowsers_castle_packed_dl_1E8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04000180, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -127,14 +127,14 @@ Gfx d_course_bowsers_castle_packed_dl_280[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040001C0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -158,8 +158,8 @@ Gfx d_course_bowsers_castle_packed_dl_338[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040003C0, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(0, 3, 4, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0),
     gsSPEndDisplayList(),
 };
 
@@ -181,8 +181,8 @@ Gfx d_course_bowsers_castle_packed_dl_3C0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000420, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(0, 3, 4, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0),
     gsSPEndDisplayList(),
 };
 
@@ -219,26 +219,26 @@ Gfx d_course_bowsers_castle_packed_dl_470[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000480, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04000680, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(6, 8, 9, 7, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(8, 14, 15, 9, 0),
-    gsSP1Quadrangle(14, 16, 17, 15, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(6, 8, 9, 0, 6, 9, 7, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(8, 14, 15, 0, 8, 15, 9, 0),
+    gsSP2Triangles(14, 16, 17, 0, 14, 17, 15, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPVertex(0x04000860, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 6, 0),
     gsSP1Triangle(9, 10, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05000800),
@@ -247,7 +247,7 @@ Gfx d_course_bowsers_castle_packed_dl_470[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000920, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(0, 3, 4, 0, 3, 5, 6, 0),
     gsSP2Triangles(3, 6, 7, 0, 8, 9, 10, 0),
     gsSP2Triangles(8, 10, 11, 0, 12, 13, 14, 0),
@@ -257,13 +257,13 @@ Gfx d_course_bowsers_castle_packed_dl_470[] =
     gsSP2Triangles(23, 24, 25, 0, 26, 27, 28, 0),
     gsSP1Triangle(27, 29, 28, 0),
     gsSPVertex(0x04000B00, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(0, 3, 4, 0, 5, 6, 7, 0),
     gsSP2Triangles(5, 7, 8, 0, 9, 10, 11, 0),
     gsSP2Triangles(9, 11, 12, 0, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSP2Triangles(16, 19, 20, 0, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSP2Triangles(28, 29, 30, 0, 29, 31, 30, 0),
     gsSPVertex(0x04000D00, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
@@ -275,33 +275,33 @@ Gfx d_course_bowsers_castle_packed_dl_470[] =
     gsSP2Triangles(26, 28, 27, 0, 29, 30, 31, 0),
     gsSPVertex(0x04000F00, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsSP2Triangles(10, 11, 12, 0, 11, 13, 12, 0),
     gsSP2Triangles(14, 15, 16, 0, 17, 18, 19, 0),
     gsSP2Triangles(17, 19, 20, 0, 21, 22, 23, 0),
     gsSP2Triangles(21, 23, 24, 0, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04001100, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 5, 7, 6, 0),
     gsSP2Triangles(8, 9, 10, 0, 11, 12, 13, 0),
     gsSP2Triangles(11, 13, 14, 0, 15, 16, 17, 0),
     gsSP2Triangles(15, 17, 18, 0, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPVertex(0x040012E0, 30, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(4, 6, 5, 0, 7, 8, 9, 0),
     gsSP2Triangles(7, 9, 10, 0, 11, 12, 13, 0),
-    gsSP1Quadrangle(11, 13, 14, 15, 0),
+    gsSP2Triangles(11, 13, 14, 0, 11, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPVertex(0x040014C0, 23, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(6, 7, 8, 0, 9, 10, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 15, 12, 14, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSP1Triangle(20, 21, 22, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500B000),
     gsDPTileSync(),
@@ -309,58 +309,58 @@ Gfx d_course_bowsers_castle_packed_dl_470[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04001630, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 17, 16, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 17, 0, 20, 17, 16, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
     gsSP2Triangles(26, 21, 20, 0, 27, 28, 29, 0),
     gsSP1Triangle(27, 29, 30, 0),
     gsSPVertex(0x04001820, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(6, 8, 9, 7, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(8, 22, 23, 9, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(25, 28, 29, 26, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(6, 8, 9, 0, 6, 9, 7, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(8, 22, 23, 0, 8, 23, 9, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(25, 28, 29, 0, 25, 29, 26, 0),
     gsSPVertex(0x04001A00, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 0, 3, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 0, 3, 0, 4, 3, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPVertex(0x04001BE0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04001DE0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500C000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04001EE0, 23, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(11, 12, 13, 14, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(11, 12, 13, 0, 11, 13, 14, 0),
     gsSP2Triangles(11, 14, 8, 0, 9, 15, 16, 0),
     gsSP2Triangles(9, 16, 10, 0, 15, 17, 18, 0),
     gsSP2Triangles(15, 18, 16, 0, 19, 20, 21, 0),
@@ -374,20 +374,20 @@ Gfx d_course_bowsers_castle_packed_dl_470[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04002050, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05006000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04002150, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -409,10 +409,10 @@ Gfx d_course_bowsers_castle_packed_dl_A20[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04002250, 10, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(4, 6, 7, 5, 0),
-    gsSP1Quadrangle(6, 8, 9, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(4, 6, 7, 0, 4, 7, 5, 0),
+    gsSP2Triangles(6, 8, 9, 0, 6, 9, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05004000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
@@ -420,17 +420,17 @@ Gfx d_course_bowsers_castle_packed_dl_A20[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040022F0, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 0, 2, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
     gsSP2Triangles(6, 3, 5, 0, 7, 4, 8, 0),
     gsSP2Triangles(7, 5, 4, 0, 9, 10, 11, 0),
     gsSP2Triangles(10, 12, 13, 0, 10, 14, 12, 0),
     gsSP2Triangles(10, 13, 11, 0, 14, 15, 12, 0),
     gsSP2Triangles(12, 16, 13, 0, 13, 16, 11, 0),
-    gsSP1Quadrangle(17, 18, 9, 11, 0),
+    gsSP2Triangles(17, 18, 9, 0, 17, 9, 11, 0),
     gsSP2Triangles(7, 6, 5, 0, 14, 19, 15, 0),
     gsSP2Triangles(20, 21, 8, 0, 21, 7, 8, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(23, 26, 27, 24, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(23, 26, 27, 0, 23, 27, 24, 0),
     gsSP2Triangles(28, 29, 30, 0, 31, 28, 30, 0),
     gsSPVertex(0x040024F0, 24, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
@@ -439,7 +439,7 @@ Gfx d_course_bowsers_castle_packed_dl_A20[] =
     gsSP2Triangles(9, 11, 12, 0, 13, 14, 9, 0),
     gsSP2Triangles(13, 9, 12, 0, 7, 15, 8, 0),
     gsSP2Triangles(7, 16, 15, 0, 17, 0, 2, 0),
-    gsSP1Quadrangle(16, 18, 19, 15, 0),
+    gsSP2Triangles(16, 18, 19, 0, 16, 19, 15, 0),
     gsSP2Triangles(20, 21, 22, 0, 21, 23, 22, 0),
     gsSP2Triangles(23, 2, 22, 0, 23, 17, 2, 0),
     gsSPEndDisplayList(),
@@ -457,7 +457,7 @@ Gfx d_course_bowsers_castle_packed_dl_B80[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04002670, 15, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(0, 3, 4, 0, 5, 6, 7, 0),
     gsSP2Triangles(5, 7, 8, 0, 9, 5, 8, 0),
     gsSP2Triangles(9, 8, 10, 0, 11, 12, 13, 0),
@@ -469,37 +469,37 @@ Gfx d_course_bowsers_castle_packed_dl_B80[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04002760, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 15, 12, 14, 0),
     gsSP2Triangles(13, 16, 14, 0, 13, 17, 18, 0),
     gsSP2Triangles(13, 18, 16, 0, 19, 15, 20, 0),
     gsSP2Triangles(15, 16, 20, 0, 15, 14, 16, 0),
     gsSP2Triangles(21, 19, 20, 0, 17, 22, 18, 0),
-    gsSP1Quadrangle(23, 24, 25, 26, 0),
+    gsSP2Triangles(23, 24, 25, 0, 23, 25, 26, 0),
     gsSP2Triangles(25, 27, 26, 0, 28, 29, 26, 0),
     gsSP2Triangles(27, 28, 26, 0, 27, 30, 28, 0),
     gsSP2Triangles(27, 31, 30, 0, 30, 29, 28, 0),
     gsSPVertex(0x04002960, 31, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(6, 8, 9, 7, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(6, 8, 9, 0, 6, 9, 7, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
     gsSP2Triangles(22, 25, 26, 0, 27, 28, 29, 0),
     gsSP1Triangle(28, 30, 29, 0),
     gsSPVertex(0x04002B50, 25, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 3, 5, 0, 6, 7, 8, 0),
     gsSP2Triangles(6, 8, 9, 0, 10, 6, 11, 0),
     gsSP2Triangles(6, 9, 11, 0, 7, 12, 8, 0),
     gsSP2Triangles(13, 10, 11, 0, 13, 14, 10, 0),
     gsSP2Triangles(1, 15, 2, 0, 7, 16, 12, 0),
-    gsSP1Quadrangle(17, 18, 19, 20, 0),
-    gsSP1Quadrangle(21, 17, 20, 22, 0),
+    gsSP2Triangles(17, 18, 19, 0, 17, 19, 20, 0),
+    gsSP2Triangles(21, 17, 20, 0, 21, 20, 22, 0),
     gsSP2Triangles(23, 4, 5, 0, 24, 23, 5, 0),
     gsSPEndDisplayList(),
 };
@@ -516,40 +516,40 @@ Gfx d_course_bowsers_castle_packed_dl_D38[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04002CE0, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(0, 3, 4, 0, 5, 6, 7, 0),
-    gsSP1Quadrangle(5, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(11, 14, 15, 12, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(18, 20, 21, 19, 0),
-    gsSP1Quadrangle(22, 10, 13, 23, 0),
-    gsSP1Quadrangle(24, 25, 22, 23, 0),
-    gsSP1Quadrangle(20, 26, 27, 21, 0),
-    gsSP1Quadrangle(26, 28, 29, 27, 0),
+    gsSP2Triangles(5, 7, 8, 0, 5, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(11, 14, 15, 0, 11, 15, 12, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(18, 20, 21, 0, 18, 21, 19, 0),
+    gsSP2Triangles(22, 10, 13, 0, 22, 13, 23, 0),
+    gsSP2Triangles(24, 25, 22, 0, 24, 22, 23, 0),
+    gsSP2Triangles(20, 26, 27, 0, 20, 27, 21, 0),
+    gsSP2Triangles(26, 28, 29, 0, 26, 29, 27, 0),
     gsSPVertex(0x04002EC0, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(4, 6, 9, 5, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(12, 14, 15, 13, 0),
-    gsSP1Quadrangle(14, 16, 17, 15, 0),
-    gsSP1Quadrangle(16, 18, 19, 17, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(4, 6, 9, 0, 4, 9, 5, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(12, 14, 15, 0, 12, 15, 13, 0),
+    gsSP2Triangles(14, 16, 17, 0, 14, 17, 15, 0),
+    gsSP2Triangles(16, 18, 19, 0, 16, 19, 17, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05004000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04003000, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSP2Triangles(24, 25, 26, 0, 27, 24, 26, 0),
-    gsSP1Quadrangle(28, 25, 24, 27, 0),
+    gsSP2Triangles(28, 25, 24, 0, 28, 24, 27, 0),
     gsSP2Triangles(29, 30, 26, 0, 30, 27, 26, 0),
     gsSP1Triangle(31, 28, 27, 0),
     gsSPVertex(0x04003200, 30, 0),
@@ -579,13 +579,13 @@ Gfx d_course_bowsers_castle_packed_dl_D38[] =
     gsSP1Triangle(20, 22, 30, 0),
     gsSPVertex(0x040035D0, 31, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(6, 8, 7, 0, 8, 9, 7, 0),
     gsSP2Triangles(9, 10, 7, 0, 11, 12, 13, 0),
-    gsSP1Quadrangle(12, 14, 15, 13, 0),
+    gsSP2Triangles(12, 14, 15, 0, 12, 15, 13, 0),
     gsSP2Triangles(12, 16, 14, 0, 17, 15, 14, 0),
     gsSP2Triangles(17, 18, 15, 0, 19, 11, 13, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSP2Triangles(24, 20, 23, 0, 16, 17, 14, 0),
     gsSP2Triangles(23, 25, 26, 0, 24, 23, 26, 0),
     gsSP2Triangles(24, 26, 27, 0, 28, 24, 27, 0),
@@ -594,12 +594,12 @@ Gfx d_course_bowsers_castle_packed_dl_D38[] =
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(3, 6, 4, 0, 7, 8, 5, 0),
     gsSP2Triangles(9, 10, 11, 0, 10, 12, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 11, 0),
     gsSP2Triangles(15, 16, 17, 0, 15, 18, 19, 0),
     gsSP2Triangles(20, 15, 19, 0, 15, 17, 18, 0),
-    gsSP1Quadrangle(16, 21, 22, 17, 0),
+    gsSP2Triangles(16, 21, 22, 0, 16, 22, 17, 0),
     gsSP2Triangles(23, 24, 14, 0, 13, 23, 14, 0),
-    gsSP1Quadrangle(25, 26, 20, 19, 0),
+    gsSP2Triangles(25, 26, 20, 0, 25, 20, 19, 0),
     gsSP2Triangles(27, 28, 29, 0, 28, 30, 31, 0),
     gsSP1Triangle(28, 31, 29, 0),
     gsSPVertex(0x040039C0, 32, 0),
@@ -615,28 +615,28 @@ Gfx d_course_bowsers_castle_packed_dl_D38[] =
     gsSPVertex(0x04003BC0, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 2, 1, 0),
     gsSP2Triangles(4, 3, 1, 0, 5, 6, 7, 0),
-    gsSP1Quadrangle(5, 7, 8, 9, 0),
+    gsSP2Triangles(5, 7, 8, 0, 5, 8, 9, 0),
     gsSP2Triangles(10, 11, 12, 0, 13, 10, 14, 0),
     gsSP2Triangles(10, 12, 14, 0, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSP2Triangles(28, 29, 30, 0, 28, 31, 29, 0),
     gsSPVertex(0x04003DC0, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(3, 5, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(7, 9, 10, 0, 11, 12, 13, 0),
-    gsSP1Quadrangle(11, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(11, 13, 14, 0, 11, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSP2Triangles(1, 20, 2, 0, 21, 22, 23, 0),
     gsSP2Triangles(22, 24, 23, 0, 1, 25, 26, 0),
     gsSP2Triangles(1, 26, 20, 0, 27, 28, 29, 0),
     gsSP2Triangles(28, 30, 29, 0, 28, 31, 30, 0),
     gsSPVertex(0x04003FC0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(4, 6, 7, 5, 0),
-    gsSP1Quadrangle(6, 8, 9, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(4, 6, 7, 0, 4, 7, 5, 0),
+    gsSP2Triangles(6, 8, 9, 0, 6, 9, 7, 0),
     gsSP2Triangles(10, 11, 12, 0, 10, 13, 11, 0),
     gsSP2Triangles(14, 10, 12, 0, 13, 15, 11, 0),
     gsSP2Triangles(15, 16, 11, 0, 15, 17, 16, 0),
@@ -648,10 +648,10 @@ Gfx d_course_bowsers_castle_packed_dl_D38[] =
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(3, 5, 6, 0, 7, 8, 3, 0),
     gsSP2Triangles(7, 3, 6, 0, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(13, 16, 17, 14, 0),
-    gsSP1Quadrangle(18, 12, 15, 19, 0),
-    gsSP1Quadrangle(20, 21, 18, 19, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(13, 16, 17, 0, 13, 17, 14, 0),
+    gsSP2Triangles(18, 12, 15, 0, 18, 15, 19, 0),
+    gsSP2Triangles(20, 21, 18, 0, 20, 18, 19, 0),
     gsSP2Triangles(22, 23, 24, 0, 22, 25, 23, 0),
     gsSP2Triangles(26, 27, 28, 0, 29, 30, 31, 0),
     gsSPVertex(0x040043C0, 5, 0),
@@ -680,34 +680,34 @@ Gfx d_course_bowsers_castle_packed_dl_1218[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04004410, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(8, 20, 21, 22, 0),
-    gsSP1Quadrangle(23, 24, 25, 26, 0),
-    gsSP1Quadrangle(27, 28, 29, 30, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(8, 20, 21, 0, 8, 21, 22, 0),
+    gsSP2Triangles(23, 24, 25, 0, 23, 25, 26, 0),
+    gsSP2Triangles(27, 28, 29, 0, 27, 29, 30, 0),
     gsSPVertex(0x04004600, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04004800, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(8, 24, 25, 26, 0),
-    gsSP1Quadrangle(27, 28, 29, 30, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(8, 24, 25, 0, 8, 25, 26, 0),
+    gsSP2Triangles(27, 28, 29, 0, 27, 29, 30, 0),
     gsSPVertex(0x040049F0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -737,8 +737,8 @@ Gfx d_course_bowsers_castle_packed_dl_1360[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04004A80, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 1, 0, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 1, 0, 3, 1, 0, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05008800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
@@ -770,8 +770,8 @@ Gfx d_course_bowsers_castle_packed_dl_1448[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04004B60, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 1, 0, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 1, 0, 3, 1, 0, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05008800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
@@ -803,8 +803,8 @@ Gfx d_course_bowsers_castle_packed_dl_1530[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04004C40, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 1, 0, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 1, 0, 3, 1, 0, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05008800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
@@ -836,8 +836,8 @@ Gfx d_course_bowsers_castle_packed_dl_1618[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04004D20, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 1, 0, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 1, 0, 3, 1, 0, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05008800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
@@ -869,8 +869,8 @@ Gfx d_course_bowsers_castle_packed_dl_1700[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04004E00, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 1, 0, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 1, 0, 3, 1, 0, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05008800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
@@ -902,8 +902,8 @@ Gfx d_course_bowsers_castle_packed_dl_17E8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04004EE0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 1, 0, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 1, 0, 3, 1, 0, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05008800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
@@ -935,8 +935,8 @@ Gfx d_course_bowsers_castle_packed_dl_18D0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04004FC0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 1, 0, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 1, 0, 3, 1, 0, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05008800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
@@ -968,8 +968,8 @@ Gfx d_course_bowsers_castle_packed_dl_19B8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040050A0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 1, 0, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 1, 0, 3, 1, 0, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05008800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
@@ -1001,8 +1001,8 @@ Gfx d_course_bowsers_castle_packed_dl_1AA0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04005180, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 1, 0, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 1, 0, 3, 1, 0, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05008800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
@@ -1034,8 +1034,8 @@ Gfx d_course_bowsers_castle_packed_dl_1B88[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04005260, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 1, 0, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 1, 0, 3, 1, 0, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05008800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
@@ -1067,8 +1067,8 @@ Gfx d_course_bowsers_castle_packed_dl_1C70[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04005340, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 1, 0, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 1, 0, 3, 1, 0, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05008800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
@@ -1100,8 +1100,8 @@ Gfx d_course_bowsers_castle_packed_dl_1D58[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04005420, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 1, 0, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 1, 0, 3, 1, 0, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05008800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
@@ -1142,8 +1142,8 @@ Gfx d_course_bowsers_castle_packed_dl_1EA8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040054B0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 11, 12, 13, 0),
     gsSP2Triangles(11, 13, 14, 0, 15, 16, 17, 0),
     gsSP2Triangles(15, 17, 18, 0, 19, 20, 21, 0),
@@ -1153,15 +1153,15 @@ Gfx d_course_bowsers_castle_packed_dl_1EA8[] =
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 4, 0),
     gsSP2Triangles(1, 4, 2, 0, 5, 6, 7, 0),
     gsSP2Triangles(5, 7, 8, 0, 9, 10, 11, 0),
-    gsSP1Quadrangle(9, 11, 12, 13, 0),
+    gsSP2Triangles(9, 11, 12, 0, 9, 12, 13, 0),
     gsSP2Triangles(14, 15, 16, 0, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x040058B0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1178,24 +1178,24 @@ Gfx d_course_bowsers_castle_packed_dl_1FA0[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04005970, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 4, 0),
-    gsSP1Quadrangle(5, 6, 7, 8, 0),
-    gsSP1Quadrangle(9, 10, 11, 12, 0),
-    gsSP1Quadrangle(13, 14, 15, 16, 0),
+    gsSP2Triangles(5, 6, 7, 0, 5, 7, 8, 0),
+    gsSP2Triangles(9, 10, 11, 0, 9, 11, 12, 0),
+    gsSP2Triangles(13, 14, 15, 0, 13, 15, 16, 0),
     gsSP2Triangles(17, 18, 19, 0, 20, 21, 22, 0),
     gsSP2Triangles(20, 23, 24, 0, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04005B70, 30, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(3, 5, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(7, 9, 10, 0, 11, 12, 13, 0),
     gsSP2Triangles(14, 15, 16, 0, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSP2Triangles(24, 25, 26, 0, 27, 28, 29, 0),
     gsSPVertex(0x04005D50, 19, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSP1Triangle(16, 17, 18, 0),
     gsSPEndDisplayList(),
 };
@@ -1221,7 +1221,7 @@ Gfx d_course_bowsers_castle_packed_dl_20B0[] =
     gsSPVertex(0x04005E80, 21, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(6, 7, 8, 0, 6, 9, 10, 0),
-    gsSP1Quadrangle(11, 12, 13, 14, 0),
+    gsSP2Triangles(11, 12, 13, 0, 11, 13, 14, 0),
     gsSP2Triangles(15, 16, 17, 0, 18, 19, 20, 0),
     gsSPEndDisplayList(),
 };
@@ -1238,7 +1238,7 @@ Gfx d_course_bowsers_castle_packed_dl_2128[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04005FD0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1351,7 +1351,7 @@ Gfx d_course_bowsers_castle_packed_dl_23E0[] =
     gsSPVertex(0x04006650, 16, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(6, 7, 8, 0, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1442,7 +1442,7 @@ Gfx d_course_bowsers_castle_packed_dl_2610[] =
     gsSP2Triangles(0, 1, 2, 0, 3, 2, 4, 0),
     gsSP2Triangles(5, 6, 7, 0, 8, 9, 10, 0),
     gsSP2Triangles(11, 12, 13, 0, 14, 15, 16, 0),
-    gsSP1Quadrangle(17, 18, 19, 20, 0),
+    gsSP2Triangles(17, 18, 19, 0, 17, 19, 20, 0),
     gsSP2Triangles(21, 22, 23, 0, 24, 25, 26, 0),
     gsSP1Triangle(27, 28, 6, 0),
     gsSPEndDisplayList(),
@@ -1610,39 +1610,39 @@ Gfx d_course_bowsers_castle_packed_dl_2A48[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04007410, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(0, 3, 4, 5, 0),
-    gsSP1Quadrangle(0, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0),
+    gsSP2Triangles(0, 5, 6, 0, 0, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05009800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04007490, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04007690, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSP2Triangles(11, 12, 8, 0, 13, 14, 8, 0),
     gsSP2Triangles(13, 8, 15, 0, 16, 17, 18, 0),
     gsSP2Triangles(16, 18, 19, 0, 17, 20, 21, 0),
-    gsSP1Quadrangle(19, 18, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 14, 13, 0),
-    gsSP1Quadrangle(30, 31, 29, 28, 0),
+    gsSP2Triangles(19, 18, 22, 0, 19, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 14, 0, 28, 14, 13, 0),
+    gsSP2Triangles(30, 31, 29, 0, 30, 29, 28, 0),
     gsSPVertex(0x04007890, 13, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 4, 6, 0),
-    gsSP1Quadrangle(7, 6, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 7, 12, 0),
+    gsSP2Triangles(7, 6, 8, 0, 7, 8, 9, 0),
+    gsSP2Triangles(10, 11, 7, 0, 10, 7, 12, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1830,64 +1830,64 @@ Gfx d_course_bowsers_castle_packed_dl_30C8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400A630, 22, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 12, 15, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 12, 15, 0, 16, 15, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500C000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400A790, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05003800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400A8D0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 0, 3, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 0, 3, 0, 4, 3, 5, 0),
     gsSP2Triangles(6, 7, 8, 0, 7, 9, 10, 0),
     gsSP2Triangles(7, 10, 8, 0, 8, 11, 6, 0),
     gsSP2Triangles(12, 7, 6, 0, 13, 14, 15, 0),
     gsSP2Triangles(14, 16, 17, 0, 15, 14, 17, 0),
-    gsSP1Quadrangle(18, 19, 15, 17, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(18, 19, 15, 0, 18, 15, 17, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0400AAD0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 6, 7, 8, 0),
     gsSP2Triangles(6, 8, 4, 0, 9, 8, 7, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 11, 15, 16, 0),
-    gsSP1Quadrangle(17, 13, 12, 14, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(21, 22, 23, 18, 0),
-    gsSP1Quadrangle(19, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
-    gsSP1Quadrangle(29, 28, 30, 31, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 11, 15, 0, 14, 15, 16, 0),
+    gsSP2Triangles(17, 13, 12, 0, 17, 12, 14, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(21, 22, 23, 0, 21, 23, 18, 0),
+    gsSP2Triangles(19, 23, 24, 0, 19, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
+    gsSP2Triangles(29, 28, 30, 0, 29, 30, 31, 0),
     gsSPVertex(0x0400ACD0, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 1, 0, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 9, 8, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 1, 0, 6, 1, 0, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 9, 0, 12, 9, 8, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPVertex(0x0400AEB0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1910,7 +1910,7 @@ Gfx d_course_bowsers_castle_packed_dl_3308[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400AF30, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(2, 4, 3, 0, 5, 6, 7, 0),
     gsSP2Triangles(5, 7, 8, 0, 8, 7, 9, 0),
     gsSP2Triangles(9, 10, 8, 0, 11, 12, 13, 0),
@@ -1920,59 +1920,59 @@ Gfx d_course_bowsers_castle_packed_dl_3308[] =
     gsSP2Triangles(21, 23, 24, 0, 25, 26, 27, 0),
     gsSP2Triangles(25, 27, 28, 0, 29, 30, 31, 0),
     gsSPVertex(0x0400B130, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(7, 9, 10, 0, 8, 7, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05000800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400B230, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05003800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400B370, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0400B570, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(5, 8, 9, 6, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(5, 8, 9, 0, 5, 9, 6, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
     gsSP2Triangles(12, 11, 14, 0, 15, 10, 13, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0400B770, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0400B970, 26, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 19, 20, 21, 0),
     gsSP2Triangles(19, 21, 22, 0, 23, 24, 25, 0),
     gsSPEndDisplayList(),
@@ -1997,26 +1997,26 @@ Gfx d_course_bowsers_castle_packed_dl_3578[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400BB10, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
-    gsSP1Quadrangle(3, 4, 5, 1, 0),
+    gsSP2Triangles(3, 4, 5, 0, 3, 5, 1, 0),
     gsSP2Triangles(4, 6, 5, 0, 6, 7, 5, 0),
     gsSP2Triangles(8, 9, 10, 0, 11, 8, 10, 0),
-    gsSP1Quadrangle(8, 12, 13, 9, 0),
-    gsSP1Quadrangle(12, 14, 15, 13, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(8, 12, 13, 0, 8, 13, 9, 0),
+    gsSP2Triangles(12, 14, 15, 0, 12, 15, 13, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSP2Triangles(17, 20, 18, 0, 20, 21, 18, 0),
     gsSP2Triangles(22, 23, 24, 0, 23, 25, 26, 0),
-    gsSP1Quadrangle(23, 26, 27, 24, 0),
-    gsSP1Quadrangle(25, 28, 29, 26, 0),
-    gsSP1Quadrangle(30, 16, 19, 31, 0),
+    gsSP2Triangles(23, 26, 27, 0, 23, 27, 24, 0),
+    gsSP2Triangles(25, 28, 29, 0, 25, 29, 26, 0),
+    gsSP2Triangles(30, 16, 19, 0, 30, 19, 31, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05000000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400BD10, 25, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSP2Triangles(9, 12, 10, 0, 13, 14, 15, 0),
     gsSP2Triangles(13, 15, 16, 0, 17, 18, 19, 0),
     gsSP2Triangles(17, 19, 20, 0, 21, 22, 23, 0),
@@ -2027,73 +2027,73 @@ Gfx d_course_bowsers_castle_packed_dl_3578[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400BEA0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(19, 18, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(19, 18, 20, 0, 19, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
     gsSP2Triangles(26, 27, 28, 0, 29, 30, 31, 0),
     gsSPVertex(0x0400C0A0, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(3, 6, 7, 4, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(3, 6, 7, 0, 3, 7, 4, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500C000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400C2A0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05004000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400C360, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0400C560, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSP2Triangles(16, 19, 20, 0, 16, 21, 22, 0),
     gsSP2Triangles(16, 22, 17, 0, 23, 24, 25, 0),
     gsSP2Triangles(23, 25, 26, 0, 27, 28, 29, 0),
     gsSP1Triangle(27, 29, 30, 0),
     gsSPVertex(0x0400C750, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(7, 6, 8, 0, 9, 10, 11, 0),
-    gsSP1Quadrangle(9, 12, 13, 10, 0),
-    gsSP1Quadrangle(14, 15, 11, 10, 0),
-    gsSP1Quadrangle(13, 16, 17, 18, 0),
+    gsSP2Triangles(9, 12, 13, 0, 9, 13, 10, 0),
+    gsSP2Triangles(14, 15, 11, 0, 14, 11, 10, 0),
+    gsSP2Triangles(13, 16, 17, 0, 13, 17, 18, 0),
     gsSP2Triangles(12, 16, 13, 0, 19, 20, 21, 0),
     gsSP2Triangles(19, 21, 22, 0, 23, 24, 25, 0),
     gsSP2Triangles(23, 25, 26, 0, 27, 28, 29, 0),
     gsSP1Triangle(27, 29, 30, 0),
     gsSPVertex(0x0400C940, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 4, 7, 5, 0),
     gsSP2Triangles(7, 8, 5, 0, 9, 10, 11, 0),
     gsSP2Triangles(12, 9, 11, 0, 10, 13, 11, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
     gsSP2Triangles(14, 17, 18, 0, 19, 20, 21, 0),
     gsSP2Triangles(19, 21, 22, 0, 23, 24, 25, 0),
     gsSP2Triangles(23, 25, 26, 0, 24, 27, 28, 0),
@@ -2123,37 +2123,37 @@ Gfx d_course_bowsers_castle_packed_dl_3930[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400CBF0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(6, 8, 9, 7, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 10, 13, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(6, 8, 9, 0, 6, 9, 7, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 10, 0, 14, 10, 13, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05000800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400CCF0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500B000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400CDB0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 5, 4, 0),
-    gsSP1Quadrangle(5, 9, 10, 11, 0),
-    gsSP1Quadrangle(6, 5, 11, 12, 0),
-    gsSP1Quadrangle(13, 14, 15, 16, 0),
-    gsSP1Quadrangle(14, 17, 18, 15, 0),
-    gsSP1Quadrangle(19, 20, 21, 22, 0),
-    gsSP1Quadrangle(19, 23, 24, 20, 0),
-    gsSP1Quadrangle(25, 26, 27, 28, 0),
-    gsSP1Quadrangle(26, 29, 30, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 5, 0, 8, 5, 4, 0),
+    gsSP2Triangles(5, 9, 10, 0, 5, 10, 11, 0),
+    gsSP2Triangles(6, 5, 11, 0, 6, 11, 12, 0),
+    gsSP2Triangles(13, 14, 15, 0, 13, 15, 16, 0),
+    gsSP2Triangles(14, 17, 18, 0, 14, 18, 15, 0),
+    gsSP2Triangles(19, 20, 21, 0, 19, 21, 22, 0),
+    gsSP2Triangles(19, 23, 24, 0, 19, 24, 20, 0),
+    gsSP2Triangles(25, 26, 27, 0, 25, 27, 28, 0),
+    gsSP2Triangles(26, 29, 30, 0, 26, 30, 27, 0),
     gsSP1Triangle(31, 29, 26, 0),
     gsSPVertex(0x0400CFB0, 21, 0),
     gsSP2Triangles(0, 1, 2, 0, 2, 1, 3, 0),
@@ -2169,53 +2169,53 @@ Gfx d_course_bowsers_castle_packed_dl_3930[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400D100, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 8, 11, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(15, 18, 19, 16, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 8, 11, 0, 12, 11, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(15, 18, 19, 0, 15, 19, 16, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0400D300, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 4, 7, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(16, 18, 19, 17, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 4, 0, 8, 4, 7, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(16, 18, 19, 0, 16, 19, 17, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0400D500, 28, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(10, 12, 13, 11, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(16, 18, 19, 17, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(10, 12, 13, 0, 10, 13, 11, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(16, 18, 19, 0, 16, 19, 17, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500B800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400D6C0, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 0, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(8, 10, 11, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 12, 15, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(20, 22, 23, 21, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(26, 28, 29, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 0, 0, 4, 0, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 12, 0, 16, 12, 15, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(26, 28, 29, 0, 26, 29, 27, 0),
     gsSPVertex(0x0400D8A0, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2239,28 +2239,28 @@ Gfx d_course_bowsers_castle_packed_dl_3C80[] =
     gsSPVertex(0x0400D900, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 0, 2, 0),
     gsSP2Triangles(3, 2, 4, 0, 5, 3, 4, 0),
-    gsSP1Quadrangle(6, 5, 4, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(6, 5, 4, 0, 6, 4, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0400DB00, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 19, 16, 18, 0),
     gsSP2Triangles(19, 18, 20, 0, 17, 21, 22, 0),
     gsSP2Triangles(17, 22, 18, 0, 23, 24, 25, 0),
     gsSP2Triangles(23, 25, 26, 0, 27, 28, 29, 0),
-    gsSP1Quadrangle(27, 30, 31, 28, 0),
+    gsSP2Triangles(27, 30, 31, 0, 27, 31, 28, 0),
     gsSPVertex(0x0400DD00, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(3, 5, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(7, 9, 10, 0, 8, 11, 9, 0),
-    gsSP1Quadrangle(12, 13, 10, 9, 0),
+    gsSP2Triangles(12, 13, 10, 0, 12, 10, 9, 0),
     gsSP2Triangles(14, 15, 16, 0, 15, 14, 17, 0),
     gsSP2Triangles(15, 17, 18, 0, 19, 20, 14, 0),
     gsSP2Triangles(19, 14, 16, 0, 21, 22, 19, 0),
@@ -2268,29 +2268,29 @@ Gfx d_course_bowsers_castle_packed_dl_3C80[] =
     gsSP2Triangles(23, 25, 26, 0, 27, 28, 29, 0),
     gsSP2Triangles(27, 29, 30, 0, 28, 31, 29, 0),
     gsSPVertex(0x0400DF00, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSP2Triangles(20, 21, 22, 0, 21, 23, 24, 0),
     gsSP2Triangles(21, 24, 22, 0, 25, 26, 27, 0),
     gsSP2Triangles(25, 27, 28, 0, 23, 29, 24, 0),
     gsSPVertex(0x0400E0E0, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(6, 8, 9, 7, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(12, 14, 15, 13, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(6, 8, 9, 0, 6, 9, 7, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(12, 14, 15, 0, 12, 15, 13, 0),
     gsSP2Triangles(16, 17, 18, 0, 19, 16, 18, 0),
-    gsSP1Quadrangle(20, 21, 18, 17, 0),
+    gsSP2Triangles(20, 21, 18, 0, 20, 18, 17, 0),
     gsSP2Triangles(20, 17, 22, 0, 23, 19, 18, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSP2Triangles(14, 12, 28, 0, 29, 30, 14, 0),
     gsSP1Triangle(29, 14, 28, 0),
     gsSPVertex(0x0400E2D0, 13, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 7, 0, 10, 11, 12, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05002000),
     gsDPTileSync(),
@@ -2298,25 +2298,25 @@ Gfx d_course_bowsers_castle_packed_dl_3C80[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400E3A0, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 0, 3, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 0, 3, 0, 4, 3, 5, 0),
     gsSP2Triangles(6, 7, 8, 0, 6, 9, 7, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(11, 6, 8, 12, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(11, 6, 8, 0, 11, 8, 12, 0),
     gsSP2Triangles(14, 5, 15, 0, 14, 4, 5, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 17, 0),
-    gsSP1Quadrangle(23, 20, 17, 16, 0),
-    gsSP1Quadrangle(17, 22, 24, 18, 0),
-    gsSP1Quadrangle(22, 25, 26, 24, 0),
-    gsSP1Quadrangle(27, 28, 29, 30, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 17, 0),
+    gsSP2Triangles(23, 20, 17, 0, 23, 17, 16, 0),
+    gsSP2Triangles(17, 22, 24, 0, 17, 24, 18, 0),
+    gsSP2Triangles(22, 25, 26, 0, 22, 26, 24, 0),
+    gsSP2Triangles(27, 28, 29, 0, 27, 29, 30, 0),
     gsSPVertex(0x0400E590, 16, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 4, 0),
     gsSP2Triangles(1, 4, 2, 0, 5, 6, 1, 0),
     gsSP2Triangles(5, 1, 0, 0, 7, 8, 3, 0),
     gsSP2Triangles(0, 2, 9, 0, 7, 10, 8, 0),
-    gsSP1Quadrangle(3, 8, 11, 4, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(3, 8, 11, 0, 3, 11, 4, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05000000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
@@ -2339,34 +2339,34 @@ Gfx d_course_bowsers_castle_packed_dl_3C80[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400E8C0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0400EAC0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0400ECC0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0400EEC0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500B000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
@@ -2378,16 +2378,16 @@ Gfx d_course_bowsers_castle_packed_dl_3C80[] =
     gsSP2Triangles(3, 6, 7, 0, 8, 9, 10, 0),
     gsSP2Triangles(8, 10, 11, 0, 11, 12, 13, 0),
     gsSP2Triangles(11, 13, 8, 0, 3, 4, 6, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
     gsSP2Triangles(18, 19, 20, 0, 21, 18, 20, 0),
     gsSP2Triangles(22, 23, 24, 0, 25, 22, 24, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPVertex(0x0400F0E0, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 5, 7, 6, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 15, 12, 14, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSP2Triangles(20, 21, 22, 0, 21, 23, 22, 0),
     gsSPEndDisplayList(),
 };
@@ -2410,121 +2410,121 @@ Gfx d_course_bowsers_castle_packed_dl_41A8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400F260, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(11, 14, 15, 12, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(11, 14, 15, 0, 11, 15, 12, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05000000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400F360, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(6, 8, 9, 7, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(16, 18, 19, 17, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(6, 8, 9, 0, 6, 9, 7, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(16, 18, 19, 0, 16, 19, 17, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500B000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400F4A0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 1, 0, 0),
-    gsSP1Quadrangle(5, 6, 7, 1, 0),
-    gsSP1Quadrangle(8, 9, 3, 2, 0),
-    gsSP1Quadrangle(10, 11, 8, 2, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 12, 15, 0),
-    gsSP1Quadrangle(14, 18, 19, 15, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 22, 0),
-    gsSP1Quadrangle(26, 27, 23, 22, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0),
+    gsSP2Triangles(5, 6, 7, 0, 5, 7, 1, 0),
+    gsSP2Triangles(8, 9, 3, 0, 8, 3, 2, 0),
+    gsSP2Triangles(10, 11, 8, 0, 10, 8, 2, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 12, 0, 16, 12, 15, 0),
+    gsSP2Triangles(14, 18, 19, 0, 14, 19, 15, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 22, 0),
+    gsSP2Triangles(26, 27, 23, 0, 26, 23, 22, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0400F6A0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(7, 10, 11, 8, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(7, 10, 11, 0, 7, 11, 8, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05004000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400F760, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 8, 11, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 8, 11, 0, 12, 11, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPVertex(0x0400F940, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(9, 12, 13, 10, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(9, 12, 13, 0, 9, 13, 10, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPVertex(0x0400FB20, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(18, 20, 21, 19, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(24, 26, 27, 25, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(18, 20, 21, 0, 18, 21, 19, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(24, 26, 27, 0, 24, 27, 25, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0400FD20, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 13, 15, 16, 0),
     gsSP2Triangles(13, 16, 14, 0, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 17, 19, 21, 0),
+    gsSP2Triangles(20, 17, 19, 0, 20, 19, 21, 0),
     gsSP2Triangles(20, 21, 22, 0, 23, 24, 25, 0),
     gsSP2Triangles(23, 25, 26, 0, 23, 27, 28, 0),
     gsSP1Triangle(23, 28, 29, 0),
     gsSPVertex(0x0400FF00, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 2, 5, 0, 6, 7, 8, 0),
     gsSP2Triangles(9, 10, 11, 0, 12, 13, 14, 0),
     gsSP2Triangles(12, 14, 15, 0, 16, 17, 18, 0),
     gsSP2Triangles(16, 18, 19, 0, 20, 21, 22, 0),
     gsSP2Triangles(20, 22, 23, 0, 0, 24, 1, 0),
-    gsSP1Quadrangle(25, 26, 27, 28, 0),
+    gsSP2Triangles(25, 26, 27, 0, 25, 27, 28, 0),
     gsSP1Triangle(26, 29, 27, 0),
     gsSPVertex(0x040100E0, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(6, 5, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(12, 14, 15, 13, 0),
-    gsSP1Quadrangle(16, 14, 12, 17, 0),
-    gsSP1Quadrangle(18, 19, 4, 7, 0),
-    gsSP1Quadrangle(20, 21, 11, 10, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(6, 5, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(12, 14, 15, 0, 12, 15, 13, 0),
+    gsSP2Triangles(16, 14, 12, 0, 16, 12, 17, 0),
+    gsSP2Triangles(18, 19, 4, 0, 18, 4, 7, 0),
+    gsSP2Triangles(20, 21, 11, 0, 20, 11, 10, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPVertex(0x040102C0, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(10, 12, 13, 11, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(10, 12, 13, 0, 10, 13, 11, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPVertex(0x040104A0, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2954,10 +2954,10 @@ Gfx d_course_bowsers_castle_packed_dl_51E8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04016AA0, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 4, 7, 5, 0),
     gsSP2Triangles(8, 9, 10, 0, 8, 11, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 16, 19, 17, 0),
     gsSP2Triangles(20, 21, 22, 0, 20, 23, 21, 0),
     gsSPEndDisplayList(),
@@ -2997,8 +2997,8 @@ Gfx d_course_bowsers_castle_packed_dl_5300[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04016DE0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 8, 11, 9, 0),
     gsSP2Triangles(12, 13, 14, 0, 12, 15, 13, 0),
     gsSPEndDisplayList(),
@@ -3016,8 +3016,8 @@ Gfx d_course_bowsers_castle_packed_dl_5378[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04016EE0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3033,8 +3033,8 @@ Gfx d_course_bowsers_castle_packed_dl_53E0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04016F60, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3050,15 +3050,15 @@ Gfx d_course_bowsers_castle_packed_dl_5448[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04016FE0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500F000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04017060, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3074,10 +3074,10 @@ Gfx d_course_bowsers_castle_packed_dl_54E8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040170A0, 18, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(7, 10, 8, 0, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3093,8 +3093,8 @@ Gfx d_course_bowsers_castle_packed_dl_5560[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040171C0, 21, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(6, 8, 7, 0, 9, 10, 11, 0),
     gsSP2Triangles(9, 11, 12, 0, 13, 14, 15, 0),
     gsSP2Triangles(13, 15, 16, 0, 17, 18, 19, 0),
@@ -3114,11 +3114,11 @@ Gfx d_course_bowsers_castle_packed_dl_55E8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04017310, 23, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(14, 16, 17, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(14, 16, 17, 0, 14, 17, 15, 0),
     gsSP2Triangles(16, 18, 17, 0, 19, 20, 21, 0),
     gsSP1Triangle(19, 21, 22, 0),
     gsSPEndDisplayList(),
@@ -3136,10 +3136,10 @@ Gfx d_course_bowsers_castle_packed_dl_5678[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04017480, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3155,10 +3155,10 @@ Gfx d_course_bowsers_castle_packed_dl_56F0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04017580, 25, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 19, 20, 21, 0),
     gsSP1Triangle(22, 23, 24, 0),
     gsSPEndDisplayList(),
@@ -3176,9 +3176,9 @@ Gfx d_course_bowsers_castle_packed_dl_5778[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04017710, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3211,29 +3211,29 @@ Gfx d_course_bowsers_castle_packed_dl_5850[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040177D0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05000000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04017810, 7, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 1, 5, 6, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 1, 5, 0, 4, 5, 6, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500B000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04017880, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 4, 5, 6, 0),
-    gsSP1Quadrangle(7, 8, 5, 9, 0),
-    gsSP1Quadrangle(10, 11, 8, 12, 0),
-    gsSP1Quadrangle(13, 14, 15, 16, 0),
-    gsSP1Quadrangle(17, 18, 19, 20, 0),
-    gsSP1Quadrangle(21, 22, 23, 24, 0),
-    gsSP1Quadrangle(25, 26, 27, 28, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 4, 5, 0, 3, 5, 6, 0),
+    gsSP2Triangles(7, 8, 5, 0, 7, 5, 9, 0),
+    gsSP2Triangles(10, 11, 8, 0, 10, 8, 12, 0),
+    gsSP2Triangles(13, 14, 15, 0, 13, 15, 16, 0),
+    gsSP2Triangles(17, 18, 19, 0, 17, 19, 20, 0),
+    gsSP2Triangles(21, 22, 23, 0, 21, 23, 24, 0),
+    gsSP2Triangles(25, 26, 27, 0, 25, 27, 28, 0),
     gsSP1Triangle(29, 30, 31, 0),
     gsSPVertex(0x04017A80, 3, 0),
     gsSP1Triangle(0, 1, 2, 0),
@@ -3243,26 +3243,26 @@ Gfx d_course_bowsers_castle_packed_dl_5850[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04017AB0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05004000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04017B70, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSP2Triangles(12, 8, 13, 0, 12, 14, 15, 0),
     gsSP2Triangles(12, 15, 8, 0, 14, 16, 15, 0),
-    gsSP1Quadrangle(17, 15, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 24, 27, 29, 0),
+    gsSP2Triangles(17, 15, 18, 0, 17, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 24, 27, 0, 28, 27, 29, 0),
     gsSPVertex(0x04017D50, 25, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(0, 3, 4, 0, 5, 6, 7, 0),
     gsSP2Triangles(5, 7, 8, 0, 9, 10, 11, 0),
     gsSP2Triangles(9, 11, 12, 0, 13, 14, 15, 0),
@@ -3284,22 +3284,22 @@ Gfx d_course_bowsers_castle_packed_dl_5A78[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04017EE0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05000000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04017F20, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500B000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04017F60, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05004000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
@@ -3310,8 +3310,8 @@ Gfx d_course_bowsers_castle_packed_dl_5A78[] =
     gsSP2Triangles(0, 4, 5, 0, 6, 0, 2, 0),
     gsSP2Triangles(6, 2, 7, 0, 8, 6, 9, 0),
     gsSP2Triangles(8, 9, 10, 0, 6, 7, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3334,15 +3334,15 @@ Gfx d_course_bowsers_castle_packed_dl_5BC8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04018120, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 3, 5, 6, 0),
-    gsSP1Quadrangle(7, 8, 9, 10, 0),
-    gsSP1Quadrangle(11, 12, 13, 14, 0),
-    gsSP1Quadrangle(15, 16, 17, 18, 0),
-    gsSP1Quadrangle(19, 20, 21, 16, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 3, 5, 0, 4, 5, 6, 0),
+    gsSP2Triangles(7, 8, 9, 0, 7, 9, 10, 0),
+    gsSP2Triangles(11, 12, 13, 0, 11, 13, 14, 0),
+    gsSP2Triangles(15, 16, 17, 0, 15, 17, 18, 0),
+    gsSP2Triangles(19, 20, 21, 0, 19, 21, 16, 0),
     gsSP2Triangles(19, 16, 22, 0, 23, 24, 5, 0),
     gsSP2Triangles(23, 5, 25, 0, 26, 27, 28, 0),
-    gsSP1Quadrangle(26, 28, 29, 29, 0),
+    gsSP2Triangles(26, 28, 29, 0, 26, 29, 29, 0),
     gsSP1Triangle(26, 29, 30, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05002000),
     gsDPTileSync(),
@@ -3350,35 +3350,35 @@ Gfx d_course_bowsers_castle_packed_dl_5BC8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04018310, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(0, 3, 4, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05000000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04018370, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05000800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040183F0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500B000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040184F0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3400,68 +3400,68 @@ Gfx d_course_bowsers_castle_packed_dl_5D98[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040185B0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(22, 24, 25, 23, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
-    gsSP1Quadrangle(24, 30, 31, 25, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(22, 24, 25, 0, 22, 25, 23, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
+    gsSP2Triangles(24, 30, 31, 0, 24, 31, 25, 0),
     gsSPVertex(0x040187B0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05000800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04018870, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(10, 7, 9, 0, 11, 12, 13, 0),
     gsSP2Triangles(11, 13, 14, 0, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
     gsSP2Triangles(18, 21, 22, 0, 23, 24, 25, 0),
     gsSP2Triangles(23, 25, 26, 0, 27, 28, 29, 0),
     gsSP1Triangle(28, 30, 29, 0),
     gsSPVertex(0x04018A60, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(8, 10, 9, 0, 11, 12, 13, 0),
-    gsSP1Quadrangle(11, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(11, 13, 14, 0, 11, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04018C60, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(6, 7, 8, 0, 9, 10, 11, 0),
     gsSP2Triangles(9, 11, 12, 0, 13, 14, 15, 0),
     gsSP2Triangles(14, 16, 15, 0, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSP2Triangles(24, 25, 26, 0, 25, 27, 26, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04018E60, 31, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(3, 5, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(10, 11, 12, 0, 11, 13, 12, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
     gsSP2Triangles(3, 18, 19, 0, 20, 21, 22, 0),
     gsSP2Triangles(20, 22, 23, 0, 24, 25, 26, 0),
     gsSP2Triangles(25, 27, 26, 0, 28, 29, 30, 0),
     gsSPVertex(0x04019050, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
     gsSP2Triangles(18, 19, 20, 0, 21, 22, 23, 0),
     gsSP2Triangles(21, 23, 24, 0, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04019250, 7, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP1Triangle(4, 5, 6, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500B000),
     gsDPTileSync(),
@@ -3469,39 +3469,39 @@ Gfx d_course_bowsers_castle_packed_dl_5D98[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040192C0, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(4, 18, 19, 5, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(21, 24, 25, 22, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
-    gsSP1Quadrangle(24, 26, 29, 25, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(4, 18, 19, 0, 4, 19, 5, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(21, 24, 25, 0, 21, 25, 22, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
+    gsSP2Triangles(24, 26, 29, 0, 24, 29, 25, 0),
     gsSPVertex(0x040194A0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x040196A0, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500C000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04019820, 21, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(0, 3, 4, 0, 5, 6, 7, 0),
     gsSP2Triangles(5, 7, 8, 0, 9, 10, 11, 0),
     gsSP2Triangles(9, 11, 12, 0, 13, 14, 15, 0),
@@ -3516,20 +3516,20 @@ Gfx d_course_bowsers_castle_packed_dl_5D98[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04019970, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05006000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04019A70, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3545,11 +3545,11 @@ Gfx d_course_bowsers_castle_packed_dl_6200[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04019B70, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05000800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
@@ -3557,7 +3557,7 @@ Gfx d_course_bowsers_castle_packed_dl_6200[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04019CB0, 31, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsSP2Triangles(6, 9, 10, 0, 11, 12, 13, 0),
     gsSP2Triangles(11, 13, 14, 0, 15, 16, 17, 0),
     gsSP2Triangles(15, 17, 18, 0, 19, 20, 21, 0),
@@ -3565,30 +3565,30 @@ Gfx d_course_bowsers_castle_packed_dl_6200[] =
     gsSP2Triangles(23, 25, 26, 0, 27, 28, 29, 0),
     gsSP1Triangle(27, 29, 30, 0),
     gsSPVertex(0x04019EA0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500B000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04019EE0, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 17, 16, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 17, 16, 0, 20, 16, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPVertex(0x0401A0C0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500C000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401A100, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3611,7 +3611,7 @@ Gfx d_course_bowsers_castle_packed_dl_63D0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401A140, 5, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP1Triangle(0, 3, 4, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05004000),
     gsDPTileSync(),
@@ -3619,8 +3619,8 @@ Gfx d_course_bowsers_castle_packed_dl_63D0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401A190, 29, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(4, 7, 8, 0, 9, 10, 11, 0),
     gsSP2Triangles(9, 11, 12, 0, 13, 14, 15, 0),
     gsSP2Triangles(13, 15, 16, 0, 17, 18, 19, 0),
@@ -3642,7 +3642,7 @@ Gfx d_course_bowsers_castle_packed_dl_64A8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401A360, 5, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP1Triangle(0, 3, 4, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05004000),
     gsDPTileSync(),
@@ -3650,7 +3650,7 @@ Gfx d_course_bowsers_castle_packed_dl_64A8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401A3B0, 29, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(0, 3, 4, 0, 5, 6, 7, 0),
     gsSP2Triangles(5, 7, 8, 0, 9, 10, 11, 0),
     gsSP2Triangles(9, 11, 12, 0, 13, 14, 15, 0),
@@ -3673,7 +3673,7 @@ Gfx d_course_bowsers_castle_packed_dl_6580[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401A580, 5, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP1Triangle(0, 3, 4, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05004000),
     gsDPTileSync(),
@@ -3681,10 +3681,10 @@ Gfx d_course_bowsers_castle_packed_dl_6580[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401A5D0, 29, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSP2Triangles(12, 15, 16, 0, 17, 18, 19, 0),
     gsSP2Triangles(17, 19, 20, 0, 21, 22, 23, 0),
     gsSP2Triangles(21, 23, 24, 0, 25, 26, 27, 0),
@@ -3730,10 +3730,10 @@ Gfx d_course_bowsers_castle_packed_dl_66E8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401A850, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3748,100 +3748,100 @@ Gfx d_course_bowsers_castle_packed_dl_6778[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x0401A950, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 0, 3, 5, 0),
-    gsSP1Quadrangle(6, 2, 1, 7, 0),
-    gsSP1Quadrangle(7, 8, 9, 6, 0),
-    gsSP1Quadrangle(8, 10, 11, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(15, 4, 5, 12, 0),
-    gsSP1Quadrangle(16, 14, 13, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 20, 19, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 24, 27, 29, 0),
-    gsSP1Quadrangle(25, 30, 31, 26, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 0, 3, 0, 4, 3, 5, 0),
+    gsSP2Triangles(6, 2, 1, 0, 6, 1, 7, 0),
+    gsSP2Triangles(7, 8, 9, 0, 7, 9, 6, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(15, 4, 5, 0, 15, 5, 12, 0),
+    gsSP2Triangles(16, 14, 13, 0, 16, 13, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 20, 19, 0, 22, 19, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 24, 27, 0, 28, 27, 29, 0),
+    gsSP2Triangles(25, 30, 31, 0, 25, 31, 26, 0),
     gsSPVertex(0x0401AB50, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 4, 7, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(13, 14, 15, 10, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 8, 9, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 24, 23, 27, 0),
-    gsSP1Quadrangle(28, 26, 27, 29, 0),
-    gsSP1Quadrangle(30, 28, 29, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 4, 7, 0, 8, 7, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(13, 14, 15, 0, 13, 15, 10, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 8, 9, 0, 20, 9, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 24, 23, 0, 26, 23, 27, 0),
+    gsSP2Triangles(28, 26, 27, 0, 28, 27, 29, 0),
+    gsSP2Triangles(30, 28, 29, 0, 30, 29, 31, 0),
     gsSPVertex(0x0401AD50, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 2, 1, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 6, 9, 11, 0),
-    gsSP1Quadrangle(12, 8, 7, 13, 0),
-    gsSP1Quadrangle(13, 14, 15, 12, 0),
-    gsSP1Quadrangle(16, 15, 14, 17, 0),
-    gsSP1Quadrangle(17, 18, 19, 16, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 22, 21, 25, 0),
-    gsSP1Quadrangle(23, 26, 27, 20, 0),
-    gsSP1Quadrangle(28, 10, 11, 29, 0),
-    gsSP1Quadrangle(18, 30, 31, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 2, 1, 0, 4, 1, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 6, 9, 0, 10, 9, 11, 0),
+    gsSP2Triangles(12, 8, 7, 0, 12, 7, 13, 0),
+    gsSP2Triangles(13, 14, 15, 0, 13, 15, 12, 0),
+    gsSP2Triangles(16, 15, 14, 0, 16, 14, 17, 0),
+    gsSP2Triangles(17, 18, 19, 0, 17, 19, 16, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 22, 21, 0, 24, 21, 25, 0),
+    gsSP2Triangles(23, 26, 27, 0, 23, 27, 20, 0),
+    gsSP2Triangles(28, 10, 11, 0, 28, 11, 29, 0),
+    gsSP2Triangles(18, 30, 31, 0, 18, 31, 19, 0),
     gsSPVertex(0x0401AF50, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 12, 15, 17, 0),
-    gsSP1Quadrangle(13, 18, 19, 14, 0),
-    gsSP1Quadrangle(20, 10, 9, 21, 0),
-    gsSP1Quadrangle(6, 22, 23, 19, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 12, 15, 0, 16, 15, 17, 0),
+    gsSP2Triangles(13, 18, 19, 0, 13, 19, 14, 0),
+    gsSP2Triangles(20, 10, 9, 0, 20, 9, 21, 0),
+    gsSP2Triangles(6, 22, 23, 0, 6, 23, 19, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0401B150, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 4, 7, 0),
-    gsSP1Quadrangle(8, 10, 11, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(13, 16, 17, 14, 0),
-    gsSP1Quadrangle(18, 3, 2, 19, 0),
-    gsSP1Quadrangle(20, 18, 19, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(25, 26, 27, 22, 0),
-    gsSP1Quadrangle(28, 29, 12, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 4, 0, 8, 4, 7, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(13, 16, 17, 0, 13, 17, 14, 0),
+    gsSP2Triangles(18, 3, 2, 0, 18, 2, 19, 0),
+    gsSP2Triangles(20, 18, 19, 0, 20, 19, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(25, 26, 27, 0, 25, 27, 22, 0),
+    gsSP2Triangles(28, 29, 12, 0, 28, 12, 15, 0),
     gsSPVertex(0x0401B330, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 1, 0, 5, 0),
-    gsSP1Quadrangle(6, 3, 2, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 13, 12, 0),
-    gsSP1Quadrangle(15, 14, 18, 19, 0),
-    gsSP1Quadrangle(19, 18, 20, 21, 0),
-    gsSP1Quadrangle(21, 20, 22, 23, 0),
-    gsSP1Quadrangle(23, 22, 17, 16, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(27, 28, 29, 24, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 1, 0, 0, 4, 0, 5, 0),
+    gsSP2Triangles(6, 3, 2, 0, 6, 2, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 13, 0, 16, 13, 12, 0),
+    gsSP2Triangles(15, 14, 18, 0, 15, 18, 19, 0),
+    gsSP2Triangles(19, 18, 20, 0, 19, 20, 21, 0),
+    gsSP2Triangles(21, 20, 22, 0, 21, 22, 23, 0),
+    gsSP2Triangles(23, 22, 17, 0, 23, 17, 16, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(27, 28, 29, 0, 27, 29, 24, 0),
     gsSPVertex(0x0401B510, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 0, 3, 5, 0),
-    gsSP1Quadrangle(1, 6, 7, 2, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 13, 12, 17, 0),
-    gsSP1Quadrangle(15, 14, 18, 19, 0),
-    gsSP1Quadrangle(20, 4, 5, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(25, 26, 27, 22, 0),
-    gsSP1Quadrangle(18, 28, 29, 19, 0),
-    gsSP1Quadrangle(28, 30, 31, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 0, 3, 0, 4, 3, 5, 0),
+    gsSP2Triangles(1, 6, 7, 0, 1, 7, 2, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 13, 12, 0, 16, 12, 17, 0),
+    gsSP2Triangles(15, 14, 18, 0, 15, 18, 19, 0),
+    gsSP2Triangles(20, 4, 5, 0, 20, 5, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(25, 26, 27, 0, 25, 27, 22, 0),
+    gsSP2Triangles(18, 28, 29, 0, 18, 29, 19, 0),
+    gsSP2Triangles(28, 30, 31, 0, 28, 31, 29, 0),
     gsSPVertex(0x0401B710, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 4, 5, 0, 0),
-    gsSP1Quadrangle(6, 5, 4, 7, 0),
-    gsSP1Quadrangle(8, 6, 7, 9, 0),
-    gsSP1Quadrangle(10, 11, 8, 9, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 4, 5, 0, 3, 5, 0, 0),
+    gsSP2Triangles(6, 5, 4, 0, 6, 4, 7, 0),
+    gsSP2Triangles(8, 6, 7, 0, 8, 7, 9, 0),
+    gsSP2Triangles(10, 11, 8, 0, 10, 8, 9, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3863,8 +3863,8 @@ Gfx d_course_bowsers_castle_packed_dl_6A90[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401B7D0, 9, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP1Triangle(4, 7, 8, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05000800),
     gsDPTileSync(),
@@ -3872,24 +3872,24 @@ Gfx d_course_bowsers_castle_packed_dl_6A90[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401B860, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05003800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401B9A0, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(9, 12, 13, 10, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(9, 12, 13, 0, 9, 13, 10, 0),
     gsSP2Triangles(14, 15, 16, 0, 17, 15, 14, 0),
     gsSP2Triangles(17, 14, 18, 0, 19, 17, 18, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3905,23 +3905,23 @@ Gfx d_course_bowsers_castle_packed_dl_6BC0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401BB20, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05003800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401BBE0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3944,19 +3944,19 @@ Gfx d_course_bowsers_castle_packed_dl_6CB8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401BDE0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0401BFE0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3972,21 +3972,21 @@ Gfx d_course_bowsers_castle_packed_dl_6D78[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401C0E0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 17, 19, 18, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0401C2E0, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4004,17 +4004,17 @@ Gfx d_course_bowsers_castle_packed_dl_6E48[] =
     gsSPVertex(0x0401C460, 30, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
     gsSP2Triangles(4, 5, 6, 0, 5, 7, 6, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 27, 26, 29, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 27, 26, 0, 28, 26, 29, 0),
     gsSPVertex(0x0401C640, 14, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(6, 8, 9, 7, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(6, 8, 9, 0, 6, 9, 7, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4030,14 +4030,14 @@ Gfx d_course_bowsers_castle_packed_dl_6F08[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401C720, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(21, 20, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(21, 20, 24, 0, 21, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4053,14 +4053,14 @@ Gfx d_course_bowsers_castle_packed_dl_6FA0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401C900, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 1, 0, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(9, 8, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 13, 12, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(19, 18, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(9, 8, 10, 0, 9, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 13, 0, 16, 13, 12, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(19, 18, 22, 0, 19, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4076,14 +4076,14 @@ Gfx d_course_bowsers_castle_packed_dl_7038[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401CA80, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(3, 2, 8, 9, 0),
-    gsSP1Quadrangle(5, 4, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 13, 12, 0),
-    gsSP1Quadrangle(19, 18, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(3, 2, 8, 0, 3, 8, 9, 0),
+    gsSP2Triangles(5, 4, 10, 0, 5, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 13, 0, 20, 13, 12, 0),
+    gsSP2Triangles(19, 18, 22, 0, 19, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4099,17 +4099,17 @@ Gfx d_course_bowsers_castle_packed_dl_70D0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401CC00, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 12, 15, 13, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0401CE00, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4125,28 +4125,28 @@ Gfx d_course_bowsers_castle_packed_dl_7180[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401CE80, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 3, 2, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 4, 5, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(26, 28, 29, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 3, 2, 0, 4, 2, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 4, 0, 14, 4, 5, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(26, 28, 29, 0, 26, 29, 27, 0),
     gsSPVertex(0x0401D060, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(13, 12, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(13, 12, 14, 0, 13, 14, 15, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05007800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401D160, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4162,18 +4162,18 @@ Gfx d_course_bowsers_castle_packed_dl_7288[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401D1A0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(8, 10, 11, 9, 0),
-    gsSP1Quadrangle(10, 12, 13, 11, 0),
-    gsSP1Quadrangle(4, 14, 15, 5, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(18, 20, 21, 19, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(24, 26, 27, 25, 0),
-    gsSP1Quadrangle(26, 28, 29, 27, 0),
-    gsSP1Quadrangle(30, 31, 17, 16, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0),
+    gsSP2Triangles(10, 12, 13, 0, 10, 13, 11, 0),
+    gsSP2Triangles(4, 14, 15, 0, 4, 15, 5, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(18, 20, 21, 0, 18, 21, 19, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(24, 26, 27, 0, 24, 27, 25, 0),
+    gsSP2Triangles(26, 28, 29, 0, 26, 29, 27, 0),
+    gsSP2Triangles(30, 31, 17, 0, 30, 17, 16, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4189,22 +4189,22 @@ Gfx d_course_bowsers_castle_packed_dl_7340[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401D3A0, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 13, 12, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 13, 12, 0, 16, 12, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPVertex(0x0401D580, 18, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 2, 1, 5, 0),
-    gsSP1Quadrangle(6, 7, 4, 5, 0),
-    gsSP1Quadrangle(8, 7, 6, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(12, 11, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 10, 13, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 2, 1, 0, 4, 1, 5, 0),
+    gsSP2Triangles(6, 7, 4, 0, 6, 4, 5, 0),
+    gsSP2Triangles(8, 7, 6, 0, 8, 6, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(12, 11, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 10, 0, 16, 10, 13, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4220,28 +4220,28 @@ Gfx d_course_bowsers_castle_packed_dl_7418[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401D6A0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 4, 7, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 10, 13, 0),
-    gsSP1Quadrangle(16, 17, 17, 18, 0),
-    gsSP1Quadrangle(16, 18, 19, 16, 0),
-    gsSP1Quadrangle(20, 19, 18, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(24, 23, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 4, 0, 8, 4, 7, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 10, 0, 14, 10, 13, 0),
+    gsSP2Triangles(16, 17, 17, 0, 16, 17, 18, 0),
+    gsSP2Triangles(16, 18, 19, 0, 16, 19, 16, 0),
+    gsSP2Triangles(20, 19, 18, 0, 20, 18, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(24, 23, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0401D8A0, 26, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 0, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(8, 7, 10, 11, 0),
-    gsSP1Quadrangle(10, 12, 13, 11, 0),
-    gsSP1Quadrangle(12, 14, 15, 13, 0),
-    gsSP1Quadrangle(5, 4, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(20, 22, 23, 21, 0),
-    gsSP1Quadrangle(24, 25, 6, 9, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 0, 0, 4, 0, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(8, 7, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(10, 12, 13, 0, 10, 13, 11, 0),
+    gsSP2Triangles(12, 14, 15, 0, 12, 15, 13, 0),
+    gsSP2Triangles(5, 4, 16, 0, 5, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0),
+    gsSP2Triangles(24, 25, 6, 0, 24, 6, 9, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4257,14 +4257,14 @@ Gfx d_course_bowsers_castle_packed_dl_7520[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401DA40, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 6, 5, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 9, 11, 10, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 14, 0),
-    gsSP1Quadrangle(19, 20, 21, 22, 0),
-    gsSP1Quadrangle(23, 24, 25, 26, 0),
-    gsSP1Quadrangle(27, 28, 25, 24, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 14, 0),
+    gsSP2Triangles(19, 20, 21, 0, 19, 21, 22, 0),
+    gsSP2Triangles(23, 24, 25, 0, 23, 25, 26, 0),
+    gsSP2Triangles(27, 28, 25, 0, 27, 25, 24, 0),
     gsSP1Triangle(29, 30, 31, 0),
     gsSPVertex(0x0401DC40, 13, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
@@ -4303,9 +4303,9 @@ Gfx d_course_bowsers_castle_packed_dl_7650[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401DD10, 11, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 2, 9, 10, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 2, 9, 0, 8, 9, 10, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4321,8 +4321,8 @@ Gfx d_course_bowsers_castle_packed_dl_76C0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401DDC0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 3, 2, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 3, 0, 4, 3, 2, 0),
     gsSP2Triangles(4, 6, 5, 0, 4, 7, 6, 0),
     gsSPEndDisplayList(),
 };
@@ -4339,8 +4339,8 @@ Gfx d_course_bowsers_castle_packed_dl_7730[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401DE40, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 1, 4, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 1, 4, 0, 2, 4, 5, 0),
     gsSP2Triangles(5, 4, 6, 0, 7, 5, 6, 0),
     gsSPEndDisplayList(),
 };
@@ -4357,11 +4357,11 @@ Gfx d_course_bowsers_castle_packed_dl_77A0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401DEC0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(5, 8, 9, 6, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(12, 14, 15, 13, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(5, 8, 9, 0, 5, 9, 6, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(12, 14, 15, 0, 12, 15, 13, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4377,10 +4377,10 @@ Gfx d_course_bowsers_castle_packed_dl_7820[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401DFC0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(6, 5, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 4, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(6, 5, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 4, 0, 10, 4, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4396,9 +4396,9 @@ Gfx d_course_bowsers_castle_packed_dl_7898[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401E080, 9, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 5, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4414,13 +4414,13 @@ Gfx d_course_bowsers_castle_packed_dl_7908[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401E110, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(8, 12, 13, 9, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 16, 15, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(8, 12, 13, 0, 8, 13, 9, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 16, 0, 18, 16, 15, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4436,10 +4436,10 @@ Gfx d_course_bowsers_castle_packed_dl_7998[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401E290, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 1, 0, 0),
-    gsSP1Quadrangle(9, 8, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 1, 0, 8, 1, 0, 0),
+    gsSP2Triangles(9, 8, 10, 0, 9, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4455,8 +4455,8 @@ Gfx d_course_bowsers_castle_packed_dl_7A10[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401E350, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4472,7 +4472,7 @@ Gfx d_course_bowsers_castle_packed_dl_7A78[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401E3D0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4488,10 +4488,10 @@ Gfx d_course_bowsers_castle_packed_dl_7AD8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401E410, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(0, 4, 5, 1, 0),
-    gsSP1Quadrangle(3, 2, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(0, 4, 5, 0, 0, 5, 1, 0),
+    gsSP2Triangles(3, 2, 6, 0, 3, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4507,8 +4507,8 @@ Gfx d_course_bowsers_castle_packed_dl_7B50[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401E4D0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4524,10 +4524,10 @@ Gfx d_course_bowsers_castle_packed_dl_7BB8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401E550, 14, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 2, 10, 0),
-    gsSP1Quadrangle(9, 11, 12, 13, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 2, 0, 8, 2, 10, 0),
+    gsSP2Triangles(9, 11, 12, 0, 9, 12, 13, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4543,13 +4543,13 @@ Gfx d_course_bowsers_castle_packed_dl_7C30[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401E630, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 2, 6, 0),
-    gsSP1Quadrangle(7, 8, 9, 10, 0),
-    gsSP1Quadrangle(10, 9, 11, 12, 0),
-    gsSP1Quadrangle(13, 14, 15, 16, 0),
-    gsSP1Quadrangle(15, 17, 18, 16, 0),
-    gsSP1Quadrangle(6, 14, 19, 4, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 2, 0, 4, 2, 6, 0),
+    gsSP2Triangles(7, 8, 9, 0, 7, 9, 10, 0),
+    gsSP2Triangles(10, 9, 11, 0, 10, 11, 12, 0),
+    gsSP2Triangles(13, 14, 15, 0, 13, 15, 16, 0),
+    gsSP2Triangles(15, 17, 18, 0, 15, 18, 16, 0),
+    gsSP2Triangles(6, 14, 19, 0, 6, 19, 4, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4565,12 +4565,12 @@ Gfx d_course_bowsers_castle_packed_dl_7CC0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401E770, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 1, 4, 5, 0),
-    gsSP1Quadrangle(4, 6, 7, 5, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(15, 14, 0, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 1, 4, 0, 2, 4, 5, 0),
+    gsSP2Triangles(4, 6, 7, 0, 4, 7, 5, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(15, 14, 0, 0, 15, 0, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4586,9 +4586,9 @@ Gfx d_course_bowsers_castle_packed_dl_7D48[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401E870, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 0, 3, 5, 0),
-    gsSP1Quadrangle(6, 7, 4, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 0, 3, 0, 4, 3, 5, 0),
+    gsSP2Triangles(6, 7, 4, 0, 6, 4, 5, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4604,9 +4604,9 @@ Gfx d_course_bowsers_castle_packed_dl_7DB8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401E8F0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4622,10 +4622,10 @@ Gfx d_course_bowsers_castle_packed_dl_7E28[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401E9B0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4641,11 +4641,11 @@ Gfx d_course_bowsers_castle_packed_dl_7EA0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401EAB0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 1, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(11, 10, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 1, 4, 0, 2, 4, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(11, 10, 14, 0, 11, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4661,10 +4661,10 @@ Gfx d_course_bowsers_castle_packed_dl_7F20[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401EBB0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 2, 1, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(8, 7, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 2, 1, 0, 4, 1, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(8, 7, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4680,9 +4680,9 @@ Gfx d_course_bowsers_castle_packed_dl_7F98[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401EC70, 11, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 4, 10, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 4, 0, 8, 4, 10, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4698,9 +4698,9 @@ Gfx d_course_bowsers_castle_packed_dl_8008[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401ED20, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 1, 0, 5, 0),
-    gsSP1Quadrangle(2, 6, 7, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 1, 0, 0, 4, 0, 5, 0),
+    gsSP2Triangles(2, 6, 7, 0, 2, 7, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4716,8 +4716,8 @@ Gfx d_course_bowsers_castle_packed_dl_8078[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401EDA0, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 1, 0, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4733,8 +4733,8 @@ Gfx d_course_bowsers_castle_packed_dl_80E0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401EE00, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4750,8 +4750,8 @@ Gfx d_course_bowsers_castle_packed_dl_8148[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401EE80, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4767,8 +4767,8 @@ Gfx d_course_bowsers_castle_packed_dl_81B0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401EEE0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4784,7 +4784,7 @@ Gfx d_course_bowsers_castle_packed_dl_8218[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401EF60, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4800,7 +4800,7 @@ Gfx d_course_bowsers_castle_packed_dl_8278[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401EFA0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4816,9 +4816,9 @@ Gfx d_course_bowsers_castle_packed_dl_82D8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401EFE0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 1, 0, 0),
-    gsSP1Quadrangle(2, 6, 7, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0),
+    gsSP2Triangles(2, 6, 7, 0, 2, 7, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4834,8 +4834,8 @@ Gfx d_course_bowsers_castle_packed_dl_8348[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401F060, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4886,9 +4886,9 @@ Gfx d_course_bowsers_castle_packed_dl_84A8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401F0E0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(0, 3, 4, 5, 0),
-    gsSP1Quadrangle(1, 6, 7, 2, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0),
+    gsSP2Triangles(1, 6, 7, 0, 1, 7, 2, 0),
     gsSP2Triangles(7, 8, 2, 0, 4, 3, 9, 0),
     gsSP2Triangles(4, 9, 10, 0, 7, 11, 12, 0),
     gsSP2Triangles(7, 12, 8, 0, 13, 14, 15, 0),
@@ -4896,47 +4896,47 @@ Gfx d_course_bowsers_castle_packed_dl_84A8[] =
     gsSP2Triangles(13, 16, 14, 0, 11, 13, 12, 0),
     gsSP2Triangles(14, 16, 17, 0, 18, 19, 20, 0),
     gsSP2Triangles(18, 20, 21, 0, 22, 18, 21, 0),
-    gsSP1Quadrangle(18, 23, 24, 19, 0),
+    gsSP2Triangles(18, 23, 24, 0, 18, 24, 19, 0),
     gsSP2Triangles(19, 25, 20, 0, 10, 9, 15, 0),
     gsSP2Triangles(10, 15, 26, 0, 27, 26, 15, 0),
-    gsSP1Quadrangle(27, 15, 14, 17, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(27, 15, 14, 0, 27, 14, 17, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0401F2E0, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 17, 0),
-    gsSP1Quadrangle(23, 24, 25, 26, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 17, 0),
+    gsSP2Triangles(23, 24, 25, 0, 23, 25, 26, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPVertex(0x0401F4C0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 4, 7, 5, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0401F6C0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0401F8C0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(5, 8, 9, 10, 0),
-    gsSP1Quadrangle(11, 12, 13, 14, 0),
-    gsSP1Quadrangle(15, 16, 17, 18, 0),
-    gsSP1Quadrangle(19, 20, 21, 18, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(25, 26, 27, 28, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(5, 8, 9, 0, 5, 9, 10, 0),
+    gsSP2Triangles(11, 12, 13, 0, 11, 13, 14, 0),
+    gsSP2Triangles(15, 16, 17, 0, 15, 17, 18, 0),
+    gsSP2Triangles(19, 20, 21, 0, 19, 21, 18, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(25, 26, 27, 0, 25, 27, 28, 0),
     gsSP1Triangle(29, 30, 31, 0),
     gsSPVertex(0x0401FAC0, 30, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
@@ -4948,37 +4948,37 @@ Gfx d_course_bowsers_castle_packed_dl_84A8[] =
     gsSP2Triangles(22, 24, 25, 0, 26, 27, 28, 0),
     gsSP1Triangle(26, 28, 29, 0),
     gsSPVertex(0x0401FCA0, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(27, 28, 29, 30, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(27, 28, 29, 0, 27, 29, 30, 0),
     gsSPVertex(0x0401FE90, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04020090, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04020290, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4994,37 +4994,37 @@ Gfx d_course_bowsers_castle_packed_dl_87E8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04020390, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(0, 3, 4, 0, 5, 6, 4, 0),
     gsSP2Triangles(5, 4, 3, 0, 7, 6, 5, 0),
-    gsSP1Quadrangle(7, 8, 9, 10, 0),
-    gsSP1Quadrangle(8, 7, 5, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 17, 0),
-    gsSP1Quadrangle(23, 24, 25, 26, 0),
-    gsSP1Quadrangle(27, 28, 29, 30, 0),
+    gsSP2Triangles(7, 8, 9, 0, 7, 9, 10, 0),
+    gsSP2Triangles(8, 7, 5, 0, 8, 5, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 17, 0),
+    gsSP2Triangles(23, 24, 25, 0, 23, 25, 26, 0),
+    gsSP2Triangles(27, 28, 29, 0, 27, 29, 30, 0),
     gsSPVertex(0x04020580, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(5, 8, 9, 10, 0),
-    gsSP1Quadrangle(11, 12, 13, 14, 0),
-    gsSP1Quadrangle(15, 16, 17, 18, 0),
-    gsSP1Quadrangle(19, 20, 21, 22, 0),
-    gsSP1Quadrangle(23, 24, 25, 26, 0),
-    gsSP1Quadrangle(27, 28, 29, 30, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(5, 8, 9, 0, 5, 9, 10, 0),
+    gsSP2Triangles(11, 12, 13, 0, 11, 13, 14, 0),
+    gsSP2Triangles(15, 16, 17, 0, 15, 17, 18, 0),
+    gsSP2Triangles(19, 20, 21, 0, 19, 21, 22, 0),
+    gsSP2Triangles(23, 24, 25, 0, 23, 25, 26, 0),
+    gsSP2Triangles(27, 28, 29, 0, 27, 29, 30, 0),
     gsSPVertex(0x04020770, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04020970, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(5, 8, 9, 0, 10, 11, 12, 0),
     gsSP2Triangles(10, 12, 13, 0, 13, 14, 15, 0),
     gsSP2Triangles(13, 15, 16, 0, 17, 18, 19, 0),
@@ -5033,31 +5033,31 @@ Gfx d_course_bowsers_castle_packed_dl_87E8[] =
     gsSP2Triangles(24, 26, 27, 0, 28, 29, 25, 0),
     gsSP1Triangle(28, 25, 30, 0),
     gsSPVertex(0x04020B60, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(7, 8, 9, 10, 0),
-    gsSP1Quadrangle(11, 12, 13, 14, 0),
-    gsSP1Quadrangle(15, 16, 17, 18, 0),
-    gsSP1Quadrangle(19, 20, 21, 18, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(23, 26, 27, 28, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(7, 8, 9, 0, 7, 9, 10, 0),
+    gsSP2Triangles(11, 12, 13, 0, 11, 13, 14, 0),
+    gsSP2Triangles(15, 16, 17, 0, 15, 17, 18, 0),
+    gsSP2Triangles(19, 20, 21, 0, 19, 21, 18, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(23, 26, 27, 0, 23, 27, 28, 0),
     gsSP1Triangle(29, 30, 31, 0),
     gsSPVertex(0x04020D60, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04020F60, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 6, 0),
-    gsSP1Quadrangle(11, 12, 13, 14, 0),
-    gsSP1Quadrangle(15, 16, 17, 18, 0),
-    gsSP1Quadrangle(19, 20, 21, 22, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 6, 0),
+    gsSP2Triangles(11, 12, 13, 0, 11, 13, 14, 0),
+    gsSP2Triangles(15, 16, 17, 0, 15, 17, 18, 0),
+    gsSP2Triangles(19, 20, 21, 0, 19, 21, 22, 0),
     gsSP2Triangles(23, 24, 25, 0, 25, 24, 26, 0),
     gsSP2Triangles(25, 26, 27, 0, 27, 26, 28, 0),
     gsSP1Triangle(29, 30, 31, 0),
@@ -5071,45 +5071,45 @@ Gfx d_course_bowsers_castle_packed_dl_87E8[] =
     gsSP2Triangles(23, 25, 26, 0, 27, 28, 29, 0),
     gsSP1Triangle(27, 29, 30, 0),
     gsSPVertex(0x04021350, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04021550, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04021750, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04021950, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04021B50, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5125,14 +5125,14 @@ Gfx d_course_bowsers_castle_packed_dl_8BE0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04021C10, 22, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 1, 0, 0),
-    gsSP1Quadrangle(3, 6, 7, 8, 0),
-    gsSP1Quadrangle(9, 10, 11, 12, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(15, 16, 17, 18, 0),
-    gsSP1Quadrangle(18, 17, 5, 4, 0),
-    gsSP1Quadrangle(19, 20, 21, 9, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0),
+    gsSP2Triangles(3, 6, 7, 0, 3, 7, 8, 0),
+    gsSP2Triangles(9, 10, 11, 0, 9, 11, 12, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(15, 16, 17, 0, 15, 17, 18, 0),
+    gsSP2Triangles(18, 17, 5, 0, 18, 5, 4, 0),
+    gsSP2Triangles(19, 20, 21, 0, 19, 21, 9, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5148,14 +5148,14 @@ Gfx d_course_bowsers_castle_packed_dl_8C78[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04021D70, 22, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 0, 0),
-    gsSP1Quadrangle(3, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 4, 0),
-    gsSP1Quadrangle(13, 14, 15, 16, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(9, 8, 20, 21, 0),
-    gsSP1Quadrangle(21, 20, 14, 13, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 0, 0),
+    gsSP2Triangles(3, 7, 8, 0, 3, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 4, 0),
+    gsSP2Triangles(13, 14, 15, 0, 13, 15, 16, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(9, 8, 20, 0, 9, 20, 21, 0),
+    gsSP2Triangles(21, 20, 14, 0, 21, 14, 13, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5171,14 +5171,14 @@ Gfx d_course_bowsers_castle_packed_dl_8D10[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04021ED0, 27, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(11, 10, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(21, 22, 23, 8, 0),
-    gsSP1Quadrangle(24, 25, 26, 18, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(11, 10, 12, 0, 11, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(21, 22, 23, 0, 21, 23, 8, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 18, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5194,14 +5194,14 @@ Gfx d_course_bowsers_castle_packed_dl_8DA8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04022080, 26, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(7, 6, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(13, 12, 5, 4, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(7, 6, 8, 0, 7, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(13, 12, 5, 0, 13, 5, 4, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5241,19 +5241,19 @@ Gfx d_course_bowsers_castle_packed_dl_8E78[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04022460, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04022660, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5269,27 +5269,27 @@ Gfx d_course_bowsers_castle_packed_dl_8FA0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04022760, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 4, 7, 0),
-    gsSP1Quadrangle(10, 6, 11, 12, 0),
-    gsSP1Quadrangle(13, 14, 15, 16, 0),
-    gsSP1Quadrangle(17, 18, 19, 20, 0),
-    gsSP1Quadrangle(21, 22, 23, 24, 0),
-    gsSP1Quadrangle(23, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 4, 0, 8, 4, 7, 0),
+    gsSP2Triangles(10, 6, 11, 0, 10, 11, 12, 0),
+    gsSP2Triangles(13, 14, 15, 0, 13, 15, 16, 0),
+    gsSP2Triangles(17, 18, 19, 0, 17, 19, 20, 0),
+    gsSP2Triangles(21, 22, 23, 0, 21, 23, 24, 0),
+    gsSP2Triangles(23, 25, 26, 0, 23, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04022960, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(10, 9, 5, 4, 0),
-    gsSP1Quadrangle(12, 13, 8, 11, 0),
-    gsSP1Quadrangle(14, 13, 12, 15, 0),
-    gsSP1Quadrangle(16, 17, 14, 15, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 23, 28, 0),
-    gsSP1Quadrangle(25, 24, 29, 30, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(10, 9, 5, 0, 10, 5, 4, 0),
+    gsSP2Triangles(12, 13, 8, 0, 12, 8, 11, 0),
+    gsSP2Triangles(14, 13, 12, 0, 14, 12, 15, 0),
+    gsSP2Triangles(16, 17, 14, 0, 16, 14, 15, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 23, 0, 26, 23, 28, 0),
+    gsSP2Triangles(25, 24, 29, 0, 25, 29, 30, 0),
     gsSP1Triangle(30, 29, 31, 0),
     gsSPVertex(0x04022B60, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
@@ -5307,48 +5307,48 @@ Gfx d_course_bowsers_castle_packed_dl_8FA0[] =
     gsSP2Triangles(24, 27, 25, 0, 29, 30, 31, 0),
     gsSP1Triangle(29, 31, 27, 0),
     gsSPVertex(0x04022D60, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 0, 5, 6, 0),
-    gsSP1Quadrangle(5, 0, 3, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(9, 12, 13, 10, 0),
-    gsSP1Quadrangle(10, 13, 14, 15, 0),
-    gsSP1Quadrangle(14, 16, 17, 15, 0),
-    gsSP1Quadrangle(7, 3, 9, 8, 0),
-    gsSP1Quadrangle(3, 2, 12, 9, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(16, 26, 27, 17, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 0, 5, 0, 4, 5, 6, 0),
+    gsSP2Triangles(5, 0, 3, 0, 5, 3, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(9, 12, 13, 0, 9, 13, 10, 0),
+    gsSP2Triangles(10, 13, 14, 0, 10, 14, 15, 0),
+    gsSP2Triangles(14, 16, 17, 0, 14, 17, 15, 0),
+    gsSP2Triangles(7, 3, 9, 0, 7, 9, 8, 0),
+    gsSP2Triangles(3, 2, 12, 0, 3, 12, 9, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(16, 26, 27, 0, 16, 27, 17, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04022F60, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(10, 12, 13, 11, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(13, 12, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(10, 12, 13, 0, 10, 13, 11, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(13, 12, 26, 0, 13, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04023160, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 6, 0),
-    gsSP1Quadrangle(7, 4, 1, 0, 0),
-    gsSP1Quadrangle(6, 8, 9, 10, 0),
-    gsSP1Quadrangle(5, 11, 8, 6, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(18, 20, 21, 19, 0),
-    gsSP1Quadrangle(21, 20, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 7, 0, 0),
-    gsSP1Quadrangle(30, 28, 0, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 6, 0),
+    gsSP2Triangles(7, 4, 1, 0, 7, 1, 0, 0),
+    gsSP2Triangles(6, 8, 9, 0, 6, 9, 10, 0),
+    gsSP2Triangles(5, 11, 8, 0, 5, 8, 6, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(18, 20, 21, 0, 18, 21, 19, 0),
+    gsSP2Triangles(21, 20, 22, 0, 21, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 7, 0, 28, 7, 0, 0),
+    gsSP2Triangles(30, 28, 0, 0, 30, 0, 3, 0),
     gsSPVertex(0x04023350, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 1, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(5, 4, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 1, 4, 0, 2, 4, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(5, 4, 10, 0, 5, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5371,14 +5371,14 @@ Gfx d_course_bowsers_castle_packed_dl_9290[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04023450, 28, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 10, 9, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 20, 19, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 10, 9, 0, 12, 9, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 20, 19, 0, 22, 19, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5394,10 +5394,10 @@ Gfx d_course_bowsers_castle_packed_dl_9328[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04023610, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5413,14 +5413,14 @@ Gfx d_course_bowsers_castle_packed_dl_93A0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04023710, 28, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 10, 9, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 20, 19, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 10, 9, 0, 12, 9, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 20, 19, 0, 22, 19, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5436,10 +5436,10 @@ Gfx d_course_bowsers_castle_packed_dl_9438[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040238D0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5488,7 +5488,7 @@ Gfx d_course_bowsers_castle_packed_dl_94D8[] =
     gsSP2Triangles(6, 7, 8, 0, 9, 10, 11, 0),
     gsSP2Triangles(11, 10, 12, 0, 13, 14, 15, 0),
     gsSP2Triangles(3, 16, 17, 0, 18, 19, 20, 0),
-    gsSP1Quadrangle(21, 22, 23, 24, 0),
+    gsSP2Triangles(21, 22, 23, 0, 21, 23, 24, 0),
     gsSP2Triangles(25, 26, 27, 0, 28, 29, 30, 0),
     gsSPVertex(0x04024180, 31, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
diff --git a/courses/star_cup/royal_raceway/course_data.inc.c b/courses/star_cup/royal_raceway/course_data.inc.c
index 84972de63..ad7e6759f 100644
--- a/courses/star_cup/royal_raceway/course_data.inc.c
+++ b/courses/star_cup/royal_raceway/course_data.inc.c
@@ -7359,7 +7359,7 @@ Gfx d_course_royal_raceway_dl_tree[] =
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x00FC),
     gsDPLoadTextureBlock(0x03009000, G_IM_FMT_CI, G_IM_SIZ_8b, 32, 64, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD),
     gsSPVertex(d_course_royal_raceway_tree_model, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPEndDisplayList(),
 };
@@ -7384,7 +7384,7 @@ Gfx d_course_royal_raceway_dl_castle_tree[] =
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x00FC),
     gsDPLoadTextureBlock(0x03009800, G_IM_FMT_CI, G_IM_SIZ_8b, 32, 64, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD),
     gsSPVertex(d_royal_raceway_peaches_castle_tree_model, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPEndDisplayList(),
 };
@@ -7415,7 +7415,7 @@ Gfx d_course_royal_raceway_dl_piranha_plant[] =
     gsDPSetTextureLUT(G_TT_RGBA16),
     gsDPLoadTLUT_pal256(d_course_royal_raceway_piranha_plant_tlut),
     gsSPVertex(d_course_royal_raceway_piranha_plant_model, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPEndDisplayList(),
 };
diff --git a/courses/star_cup/royal_raceway/packed.inc.c b/courses/star_cup/royal_raceway/packed.inc.c
index 9f722adce..04b03a948 100644
--- a/courses/star_cup/royal_raceway/packed.inc.c
+++ b/courses/star_cup/royal_raceway/packed.inc.c
@@ -18,16 +18,16 @@ Gfx d_course_royal_raceway_packed_dl_0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04000000, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(18, 20, 21, 19, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(23, 26, 27, 24, 0),
-    gsSP1Quadrangle(28, 29, 22, 25, 0),
-    gsSP1Quadrangle(20, 30, 31, 21, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(18, 20, 21, 0, 18, 21, 19, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(23, 26, 27, 0, 23, 27, 24, 0),
+    gsSP2Triangles(28, 29, 22, 0, 28, 22, 25, 0),
+    gsSP2Triangles(20, 30, 31, 0, 20, 31, 21, 0),
     gsSPEndDisplayList(),
 };
 
@@ -43,12 +43,12 @@ Gfx d_course_royal_raceway_packed_dl_A8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04000200, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -64,10 +64,10 @@ Gfx d_course_royal_raceway_packed_dl_130[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04000380, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -91,8 +91,8 @@ Gfx d_course_royal_raceway_packed_dl_1C8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000480, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -108,10 +108,10 @@ Gfx d_course_royal_raceway_packed_dl_230[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000500, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -127,10 +127,10 @@ Gfx d_course_royal_raceway_packed_dl_2A8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000600, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -154,28 +154,28 @@ Gfx d_course_royal_raceway_packed_dl_340[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000700, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04000900, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04000B00, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 6, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x007C),
@@ -185,14 +185,14 @@ Gfx d_course_royal_raceway_packed_dl_340[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04000C00, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0501C000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04000C40, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -214,8 +214,8 @@ Gfx d_course_royal_raceway_packed_dl_4E0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000C80, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -237,11 +237,11 @@ Gfx d_course_royal_raceway_packed_dl_558[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000D00, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -257,10 +257,10 @@ Gfx d_course_royal_raceway_packed_dl_5D8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000E40, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -283,8 +283,8 @@ Gfx d_course_royal_raceway_packed_dl_668[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000F40, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -306,9 +306,9 @@ Gfx d_course_royal_raceway_packed_dl_6E0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04000FC0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -324,9 +324,9 @@ Gfx d_course_royal_raceway_packed_dl_750[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04001080, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -342,11 +342,11 @@ Gfx d_course_royal_raceway_packed_dl_7C0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04001140, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -388,8 +388,8 @@ Gfx d_course_royal_raceway_packed_dl_8B0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04001280, 22, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 11, 12, 13, 0),
     gsSP2Triangles(11, 13, 14, 0, 15, 16, 17, 0),
     gsSP2Triangles(15, 17, 18, 0, 19, 20, 21, 0),
@@ -408,14 +408,14 @@ Gfx d_course_royal_raceway_packed_dl_930[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040013E0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -431,25 +431,25 @@ Gfx d_course_royal_raceway_packed_dl_9C8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040015E0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSP2Triangles(12, 15, 16, 0, 17, 18, 19, 0),
     gsSP2Triangles(17, 19, 20, 0, 19, 21, 22, 0),
-    gsSP1Quadrangle(19, 22, 23, 20, 0),
-    gsSP1Quadrangle(21, 24, 25, 22, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
-    gsSP1Quadrangle(27, 30, 31, 28, 0),
+    gsSP2Triangles(19, 22, 23, 0, 19, 23, 20, 0),
+    gsSP2Triangles(21, 24, 25, 0, 21, 25, 22, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
+    gsSP2Triangles(27, 30, 31, 0, 27, 31, 28, 0),
     gsSPVertex(0x040017E0, 26, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
     gsSP2Triangles(4, 6, 5, 0, 4, 7, 8, 0),
     gsSP2Triangles(4, 8, 6, 0, 9, 10, 11, 0),
     gsSP2Triangles(9, 11, 12, 0, 13, 14, 15, 0),
     gsSP2Triangles(13, 15, 16, 0, 17, 18, 19, 0),
     gsSP2Triangles(17, 19, 20, 0, 21, 22, 23, 0),
-    gsSP1Quadrangle(21, 23, 24, 25, 0),
+    gsSP2Triangles(21, 23, 24, 0, 21, 24, 25, 0),
     gsSPEndDisplayList(),
 };
 
@@ -465,19 +465,19 @@ Gfx d_course_royal_raceway_packed_dl_AB8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04001980, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04001B80, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -493,19 +493,19 @@ Gfx d_course_royal_raceway_packed_dl_B78[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04001C80, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04001E80, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -556,19 +556,19 @@ Gfx d_course_royal_raceway_packed_dl_CF0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040020A0, 14, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 2, 0),
-    gsSP1Quadrangle(7, 8, 9, 10, 0),
-    gsSP1Quadrangle(8, 11, 12, 13, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 2, 0),
+    gsSP2Triangles(7, 8, 9, 0, 7, 9, 10, 0),
+    gsSP2Triangles(8, 11, 12, 0, 8, 12, 13, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05019000),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04002180, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(4, 6, 7, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(4, 6, 7, 0, 4, 7, 5, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 6, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x00FC),
@@ -578,14 +578,14 @@ Gfx d_course_royal_raceway_packed_dl_CF0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04002200, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 0, 3, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 0, 3, 0, 4, 3, 5, 0),
     gsSP2Triangles(6, 0, 4, 0, 6, 1, 0, 0),
-    gsSP1Quadrangle(3, 2, 7, 5, 0),
+    gsSP2Triangles(3, 2, 7, 0, 3, 7, 5, 0),
     gsSP2Triangles(8, 9, 10, 0, 8, 11, 9, 0),
-    gsSP1Quadrangle(9, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 13, 12, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(9, 11, 12, 0, 9, 12, 13, 0),
+    gsSP2Triangles(14, 13, 12, 0, 14, 12, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -595,7 +595,7 @@ Gfx d_course_royal_raceway_packed_dl_CF0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04002340, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -628,7 +628,7 @@ Gfx d_course_royal_raceway_packed_dl_E98[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04002400, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500B800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
@@ -651,9 +651,9 @@ Gfx d_course_royal_raceway_packed_dl_F88[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04002480, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 4, 7, 5, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 12, 15, 13, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 6, G_TX_NOLOD),
@@ -664,8 +664,8 @@ Gfx d_course_royal_raceway_packed_dl_F88[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04002580, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05009800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
@@ -673,7 +673,7 @@ Gfx d_course_royal_raceway_packed_dl_F88[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04002600, 8, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -689,8 +689,8 @@ Gfx d_course_royal_raceway_packed_dl_1098[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04002680, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 8, 11, 9, 0),
     gsSP2Triangles(12, 13, 14, 0, 12, 15, 13, 0),
     gsDPTileSync(),
@@ -711,7 +711,7 @@ Gfx d_course_royal_raceway_packed_dl_1098[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04002800, 8, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -736,9 +736,9 @@ Gfx d_course_royal_raceway_packed_dl_11C8[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04002880, 16, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 0, 2, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -751,8 +751,8 @@ Gfx d_course_royal_raceway_packed_dl_11C8[] =
     gsSP2Triangles(0, 1, 2, 0, 2, 1, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(10, 11, 12, 0, 13, 10, 12, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
     gsSPEndDisplayList(),
 };
 
@@ -772,17 +772,17 @@ Gfx d_course_royal_raceway_packed_dl_12B0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04002B30, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04002D30, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -792,17 +792,17 @@ Gfx d_course_royal_raceway_packed_dl_12B0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04002DB0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04002FB0, 23, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 11, 12, 13, 0),
     gsSP2Triangles(14, 15, 16, 0, 17, 18, 19, 0),
     gsSP1Triangle(20, 21, 22, 0),
@@ -828,8 +828,8 @@ Gfx d_course_royal_raceway_packed_dl_1450[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04003120, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 8, 11, 9, 0),
     gsSP2Triangles(12, 13, 14, 0, 13, 15, 14, 0),
     gsSPEndDisplayList(),
@@ -848,10 +848,10 @@ Gfx d_course_royal_raceway_packed_dl_14C8[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04003220, 20, 0),
     gsSP2Triangles(0, 1, 2, 0, 2, 3, 0, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 9, 11, 10, 0),
     gsSP2Triangles(12, 13, 14, 0, 14, 15, 12, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -868,12 +868,12 @@ Gfx d_course_royal_raceway_packed_dl_1548[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04003360, 28, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 0, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 16, 19, 17, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSPEndDisplayList(),
 };
 
@@ -889,8 +889,8 @@ Gfx d_course_royal_raceway_packed_dl_15D8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04003520, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -925,8 +925,8 @@ Gfx d_course_royal_raceway_packed_dl_16B8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040036A0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -959,7 +959,7 @@ Gfx d_course_royal_raceway_packed_dl_1788[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040037A0, 11, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 5, 7, 6, 0),
     gsSP1Triangle(8, 9, 10, 0),
     gsSPEndDisplayList(),
@@ -1031,8 +1031,8 @@ Gfx d_course_royal_raceway_packed_dl_1940[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04003A40, 12, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1048,7 +1048,7 @@ Gfx d_course_royal_raceway_packed_dl_19B0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04003B00, 17, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 4, 6, 0),
     gsSP2Triangles(7, 8, 4, 0, 9, 10, 11, 0),
     gsSP2Triangles(12, 9, 11, 0, 13, 14, 15, 0),
@@ -1125,17 +1125,17 @@ Gfx d_course_royal_raceway_packed_dl_1B98[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04003DC0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04003FC0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1151,16 +1151,16 @@ Gfx d_course_royal_raceway_packed_dl_1C48[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04004040, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04004240, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1176,10 +1176,10 @@ Gfx d_course_royal_raceway_packed_dl_1CF0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04004280, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1195,12 +1195,12 @@ Gfx d_course_royal_raceway_packed_dl_1D68[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04004380, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1216,9 +1216,9 @@ Gfx d_course_royal_raceway_packed_dl_1DF0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04004500, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1234,13 +1234,13 @@ Gfx d_course_royal_raceway_packed_dl_1E60[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040045C0, 28, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1256,8 +1256,8 @@ Gfx d_course_royal_raceway_packed_dl_1EF0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04004780, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1273,13 +1273,13 @@ Gfx d_course_royal_raceway_packed_dl_1F58[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04004800, 28, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1306,7 +1306,7 @@ Gfx d_course_royal_raceway_packed_dl_1FE8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04004A60, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1322,9 +1322,9 @@ Gfx d_course_royal_raceway_packed_dl_20A0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04004AA0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1340,16 +1340,16 @@ Gfx d_course_royal_raceway_packed_dl_2110[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04004B60, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSP1Triangle(28, 29, 30, 0),
     gsSPVertex(0x04004D50, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1365,8 +1365,8 @@ Gfx d_course_royal_raceway_packed_dl_21B8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04004D90, 18, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 8, 11, 9, 0),
     gsSP2Triangles(12, 13, 14, 0, 15, 16, 17, 0),
     gsSPEndDisplayList(),
@@ -1384,13 +1384,13 @@ Gfx d_course_royal_raceway_packed_dl_2230[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04004EB0, 28, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1406,17 +1406,17 @@ Gfx d_course_royal_raceway_packed_dl_22C0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04005070, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04005270, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1432,12 +1432,12 @@ Gfx d_course_royal_raceway_packed_dl_2370[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040052F0, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1453,11 +1453,11 @@ Gfx d_course_royal_raceway_packed_dl_23F8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04005470, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1473,18 +1473,18 @@ Gfx d_course_royal_raceway_packed_dl_2478[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040055B0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x040057B0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1500,17 +1500,17 @@ Gfx d_course_royal_raceway_packed_dl_2530[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04005870, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04005A70, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1526,21 +1526,21 @@ Gfx d_course_royal_raceway_packed_dl_25E0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04005AF0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04005CF0, 26, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1556,16 +1556,16 @@ Gfx d_course_royal_raceway_packed_dl_26B0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04005E90, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSP2Triangles(20, 21, 22, 0, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPVertex(0x04006070, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1582,11 +1582,11 @@ Gfx d_course_royal_raceway_packed_dl_2758[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040060F0, 26, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1602,11 +1602,11 @@ Gfx d_course_royal_raceway_packed_dl_27E0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04006290, 28, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSP2Triangles(20, 21, 22, 0, 20, 23, 21, 0),
     gsSP2Triangles(24, 25, 26, 0, 24, 27, 25, 0),
     gsSPEndDisplayList(),
@@ -1624,8 +1624,8 @@ Gfx d_course_royal_raceway_packed_dl_2870[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04006450, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1641,10 +1641,10 @@ Gfx d_course_royal_raceway_packed_dl_28D8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040064D0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1660,19 +1660,19 @@ Gfx d_course_royal_raceway_packed_dl_2950[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040065D0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x040067D0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1688,18 +1688,18 @@ Gfx d_course_royal_raceway_packed_dl_2A10[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040068D0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04006AD0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1715,9 +1715,9 @@ Gfx d_course_royal_raceway_packed_dl_2AC8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04006B90, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1733,8 +1733,8 @@ Gfx d_course_royal_raceway_packed_dl_2B38[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04006C50, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1750,8 +1750,8 @@ Gfx d_course_royal_raceway_packed_dl_2BA0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04006CD0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1801,12 +1801,12 @@ Gfx d_course_royal_raceway_packed_dl_2CF8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04006D50, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1822,12 +1822,12 @@ Gfx d_course_royal_raceway_packed_dl_2D80[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04006ED0, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1843,22 +1843,22 @@ Gfx d_course_royal_raceway_packed_dl_2E08[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04007050, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04007250, 28, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1874,12 +1874,12 @@ Gfx d_course_royal_raceway_packed_dl_2EE0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04007410, 28, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSP2Triangles(24, 25, 26, 0, 24, 27, 25, 0),
     gsSPEndDisplayList(),
 };
@@ -1896,16 +1896,16 @@ Gfx d_course_royal_raceway_packed_dl_2F70[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040075D0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x040077D0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1921,10 +1921,10 @@ Gfx d_course_royal_raceway_packed_dl_3018[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04007810, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1940,12 +1940,12 @@ Gfx d_course_royal_raceway_packed_dl_3090[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04007910, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1961,9 +1961,9 @@ Gfx d_course_royal_raceway_packed_dl_3118[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04007A90, 15, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSP1Triangle(12, 13, 14, 0),
     gsSPEndDisplayList(),
 };
@@ -1980,12 +1980,12 @@ Gfx d_course_royal_raceway_packed_dl_3190[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04007B80, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2015,8 +2015,8 @@ Gfx d_course_royal_raceway_packed_dl_3268[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04007D00, 13, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 2, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 2, 0),
     gsSP2Triangles(4, 2, 1, 0, 5, 7, 8, 0),
     gsSP2Triangles(5, 8, 6, 0, 9, 8, 10, 0),
     gsSP2Triangles(9, 10, 11, 0, 8, 7, 10, 0),
@@ -2037,7 +2037,7 @@ Gfx d_course_royal_raceway_packed_dl_32F0[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04007DD0, 15, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 1, 0, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 11, 12, 13, 0),
     gsSP1Triangle(11, 13, 14, 0),
     gsSPEndDisplayList(),
@@ -2073,7 +2073,7 @@ Gfx d_course_royal_raceway_packed_dl_33D8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04007F70, 5, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP1Triangle(4, 1, 0, 0),
     gsSPEndDisplayList(),
 };
@@ -2091,7 +2091,7 @@ Gfx d_course_royal_raceway_packed_dl_3440[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04007FC0, 9, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(6, 0, 3, 5, 0),
+    gsSP2Triangles(6, 0, 3, 0, 6, 3, 5, 0),
     gsSP2Triangles(1, 0, 6, 0, 6, 5, 7, 0),
     gsSP2Triangles(5, 4, 7, 0, 4, 3, 8, 0),
     gsSP1Triangle(3, 0, 8, 0),
@@ -2110,8 +2110,8 @@ Gfx d_course_royal_raceway_packed_dl_34C0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04008050, 11, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 0, 3, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 0, 3, 0, 4, 3, 5, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 6, 5, 0),
     gsSP2Triangles(7, 5, 8, 0, 9, 6, 7, 0),
     gsSP1Triangle(7, 8, 10, 0),
@@ -2143,11 +2143,11 @@ Gfx d_course_royal_raceway_packed_dl_3540[] =
     gsSP2Triangles(23, 26, 22, 0, 27, 28, 29, 0),
     gsSP1Triangle(29, 28, 30, 0),
     gsSPVertex(0x040082F0, 14, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(6, 8, 7, 0, 8, 9, 7, 0),
     gsSP2Triangles(5, 4, 10, 0, 11, 5, 10, 0),
-    gsSP1Quadrangle(11, 10, 12, 13, 0),
+    gsSP2Triangles(11, 10, 12, 0, 11, 12, 13, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2165,10 +2165,10 @@ Gfx d_course_royal_raceway_packed_dl_3628[] =
     gsSPVertex(0x040083D0, 17, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
     gsSP2Triangles(2, 1, 4, 0, 5, 6, 1, 0),
-    gsSP1Quadrangle(1, 6, 7, 8, 0),
-    gsSP1Quadrangle(1, 8, 9, 10, 0),
+    gsSP2Triangles(1, 6, 7, 0, 1, 7, 8, 0),
+    gsSP2Triangles(1, 8, 9, 0, 1, 9, 10, 0),
     gsSP2Triangles(1, 10, 4, 0, 5, 11, 6, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSP1Triangle(5, 16, 11, 0),
     gsSPEndDisplayList(),
 };
@@ -2235,8 +2235,8 @@ Gfx d_course_royal_raceway_packed_dl_37E8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040085C0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -2246,7 +2246,7 @@ Gfx d_course_royal_raceway_packed_dl_37E8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04008640, 17, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(10, 11, 12, 0, 13, 14, 15, 0),
     gsSP1Triangle(13, 15, 16, 0),
@@ -2259,7 +2259,7 @@ Gfx d_course_royal_raceway_packed_dl_37E8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04008750, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2275,9 +2275,9 @@ Gfx d_course_royal_raceway_packed_dl_3908[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04008790, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2285,12 +2285,12 @@ Gfx d_course_royal_raceway_packed_dl_3978[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x04008850, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(0, 4, 5, 1, 0),
-    gsSP1Quadrangle(1, 5, 6, 7, 0),
-    gsSP1Quadrangle(1, 7, 8, 2, 0),
-    gsSP1Quadrangle(7, 6, 9, 10, 0),
-    gsSP1Quadrangle(7, 10, 11, 8, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(0, 4, 5, 0, 0, 5, 1, 0),
+    gsSP2Triangles(1, 5, 6, 0, 1, 6, 7, 0),
+    gsSP2Triangles(1, 7, 8, 0, 1, 8, 2, 0),
+    gsSP2Triangles(7, 6, 9, 0, 7, 9, 10, 0),
+    gsSP2Triangles(7, 10, 11, 0, 7, 11, 8, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
@@ -2301,7 +2301,7 @@ Gfx d_course_royal_raceway_packed_dl_3978[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04008910, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(1, 4, 2, 0, 5, 3, 2, 0),
     gsSP2Triangles(4, 5, 2, 0, 6, 7, 8, 0),
     gsSP2Triangles(6, 9, 7, 0, 10, 11, 8, 0),
@@ -2315,7 +2315,7 @@ Gfx d_course_royal_raceway_packed_dl_3978[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040089D0, 11, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(0, 4, 1, 0, 4, 5, 6, 0),
     gsSP2Triangles(4, 7, 1, 0, 4, 6, 7, 0),
     gsSP2Triangles(5, 8, 9, 0, 5, 10, 6, 0),
@@ -2329,18 +2329,18 @@ Gfx d_course_royal_raceway_packed_dl_3978[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04008A80, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05011800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04008B40, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3442,7 +3442,7 @@ Gfx d_course_royal_raceway_packed_dl_57F0[] =
     gsSPVertex(0x04011360, 31, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(6, 7, 8, 0, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 12, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 12, 0),
     gsSP2Triangles(15, 16, 17, 0, 18, 19, 20, 0),
     gsSP2Triangles(21, 19, 22, 0, 1, 23, 24, 0),
     gsSP2Triangles(25, 26, 27, 0, 28, 29, 30, 0),
@@ -3769,7 +3769,7 @@ Gfx d_course_royal_raceway_packed_dl_60D8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04013F60, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 6, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x007C),
@@ -3779,7 +3779,7 @@ Gfx d_course_royal_raceway_packed_dl_60D8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04013FA0, 21, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 1, 0, 0, 5, 6, 7, 0),
     gsSP2Triangles(5, 7, 8, 0, 9, 10, 11, 0),
     gsSP2Triangles(9, 11, 12, 0, 13, 14, 15, 0),
@@ -3795,7 +3795,7 @@ Gfx d_course_royal_raceway_packed_dl_60D8[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040140F0, 30, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsSP2Triangles(10, 11, 12, 0, 12, 13, 10, 0),
     gsSP2Triangles(14, 15, 16, 0, 14, 17, 15, 0),
     gsSP2Triangles(18, 19, 20, 0, 21, 22, 23, 0),
@@ -3815,7 +3815,7 @@ Gfx d_course_royal_raceway_packed_dl_6228[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040142D0, 17, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(0, 3, 4, 0, 5, 6, 7, 0),
     gsSP2Triangles(5, 7, 8, 0, 9, 10, 11, 0),
     gsSP2Triangles(9, 11, 12, 0, 13, 14, 15, 0),
@@ -3851,7 +3851,7 @@ Gfx d_course_royal_raceway_packed_dl_6328[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x040145E0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -3861,38 +3861,38 @@ Gfx d_course_royal_raceway_packed_dl_6328[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04014620, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSP2Triangles(20, 21, 22, 0, 20, 23, 21, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04014820, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04014A20, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 5, 7, 8, 0),
     gsSP2Triangles(6, 5, 9, 0, 10, 11, 5, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 16, 19, 17, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04014C20, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 6, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x007C),
@@ -3904,12 +3904,12 @@ Gfx d_course_royal_raceway_packed_dl_6328[] =
     gsSPVertex(0x04014D60, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(4, 6, 5, 0, 7, 3, 5, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSP2Triangles(14, 16, 15, 0, 16, 17, 15, 0),
-    gsSP1Quadrangle(16, 18, 19, 17, 0),
+    gsSP2Triangles(16, 18, 19, 0, 16, 19, 17, 0),
     gsSP2Triangles(20, 21, 22, 0, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSP1Triangle(26, 30, 31, 0),
     gsSPVertex(0x04014F60, 31, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
@@ -3918,50 +3918,50 @@ Gfx d_course_royal_raceway_packed_dl_6328[] =
     gsSP2Triangles(9, 12, 11, 0, 13, 14, 15, 0),
     gsSP2Triangles(13, 15, 13, 0, 16, 14, 13, 0),
     gsSP2Triangles(17, 18, 19, 0, 20, 21, 22, 0),
-    gsSP1Quadrangle(21, 23, 24, 22, 0),
+    gsSP2Triangles(21, 23, 24, 0, 21, 24, 22, 0),
     gsSP2Triangles(25, 26, 27, 0, 28, 29, 30, 0),
     gsSPVertex(0x04015150, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 5, 8, 0),
+    gsSP2Triangles(6, 7, 5, 0, 6, 5, 8, 0),
     gsSP2Triangles(9, 10, 11, 0, 12, 13, 14, 0),
     gsSP2Triangles(12, 14, 15, 0, 16, 17, 18, 0),
     gsSP2Triangles(19, 20, 21, 0, 22, 23, 24, 0),
     gsSP2Triangles(25, 26, 27, 0, 28, 29, 30, 0),
     gsSP1Triangle(28, 30, 31, 0),
     gsSPVertex(0x04015350, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSP2Triangles(16, 19, 20, 0, 21, 22, 23, 0),
     gsSP2Triangles(21, 24, 22, 0, 25, 26, 27, 0),
     gsSP2Triangles(25, 27, 28, 0, 29, 30, 31, 0),
     gsSPVertex(0x04015550, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 3, 6, 0),
-    gsSP1Quadrangle(7, 8, 9, 10, 0),
-    gsSP1Quadrangle(11, 12, 13, 14, 0),
-    gsSP1Quadrangle(15, 16, 17, 18, 0),
-    gsSP1Quadrangle(19, 20, 21, 22, 0),
-    gsSP1Quadrangle(23, 24, 25, 26, 0),
-    gsSP1Quadrangle(27, 28, 29, 30, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 3, 0, 4, 3, 6, 0),
+    gsSP2Triangles(7, 8, 9, 0, 7, 9, 10, 0),
+    gsSP2Triangles(11, 12, 13, 0, 11, 13, 14, 0),
+    gsSP2Triangles(15, 16, 17, 0, 15, 17, 18, 0),
+    gsSP2Triangles(19, 20, 21, 0, 19, 21, 22, 0),
+    gsSP2Triangles(23, 24, 25, 0, 23, 25, 26, 0),
+    gsSP2Triangles(27, 28, 29, 0, 27, 29, 30, 0),
     gsSPVertex(0x04015740, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPVertex(0x04015920, 28, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -3975,7 +3975,7 @@ Gfx d_course_royal_raceway_packed_dl_6328[] =
     gsSP2Triangles(4, 5, 6, 0, 5, 7, 6, 0),
     gsSP2Triangles(5, 4, 8, 0, 9, 10, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 13, 15, 14, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSP2Triangles(19, 18, 20, 0, 21, 22, 23, 0),
     gsSP2Triangles(24, 25, 26, 0, 25, 27, 26, 0),
     gsSP1Triangle(28, 29, 30, 0),
@@ -3986,12 +3986,12 @@ Gfx d_course_royal_raceway_packed_dl_6328[] =
     gsSP2Triangles(18, 19, 20, 0, 21, 22, 23, 0),
     gsSP2Triangles(24, 25, 26, 0, 27, 28, 29, 0),
     gsSPVertex(0x04015EB0, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 4, 6, 0),
     gsSP2Triangles(4, 8, 5, 0, 9, 7, 6, 0),
     gsSP2Triangles(10, 6, 11, 0, 9, 6, 10, 0),
     gsSP2Triangles(12, 13, 14, 0, 15, 10, 11, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4152,7 +4152,7 @@ Gfx d_course_royal_raceway_packed_dl_6B60[] =
     gsSPVertex(0x04016930, 28, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(6, 7, 8, 0, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 2, 1, 19, 0),
     gsSP2Triangles(20, 21, 22, 0, 23, 24, 25, 0),
     gsSP1Triangle(26, 27, 25, 0),
@@ -4500,7 +4500,7 @@ Gfx d_course_royal_raceway_packed_dl_73E0[] =
     gsSPVertex(0x04018240, 16, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(6, 7, 8, 0, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5508,7 +5508,7 @@ Gfx d_course_royal_raceway_packed_dl_8D48[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401C100, 18, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(3, 5, 6, 7, 0),
+    gsSP2Triangles(3, 5, 6, 0, 3, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 10, 9, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 15, 16, 17, 0),
     gsSPEndDisplayList(),
@@ -5545,8 +5545,8 @@ Gfx d_course_royal_raceway_packed_dl_8E30[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0401C2B0, 18, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 15, 16, 17, 0),
     gsSPEndDisplayList(),
 };
@@ -5833,7 +5833,7 @@ Gfx d_course_royal_raceway_packed_dl_9520[] =
     gsSPVertex(0x0401D260, 12, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
     gsSP2Triangles(4, 5, 6, 0, 4, 7, 5, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5876,10 +5876,10 @@ Gfx d_course_royal_raceway_packed_dl_9630[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0401D3B0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5895,9 +5895,9 @@ Gfx d_course_royal_raceway_packed_dl_96A8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0401D4B0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5913,7 +5913,7 @@ Gfx d_course_royal_raceway_packed_dl_9718[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0401D570, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5929,9 +5929,9 @@ Gfx d_course_royal_raceway_packed_dl_9778[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0401D5B0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5947,7 +5947,7 @@ Gfx d_course_royal_raceway_packed_dl_97E8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0401D670, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5963,9 +5963,9 @@ Gfx d_course_royal_raceway_packed_dl_9848[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0401D6B0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5981,7 +5981,7 @@ Gfx d_course_royal_raceway_packed_dl_98B8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0401D770, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5997,9 +5997,9 @@ Gfx d_course_royal_raceway_packed_dl_9918[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0401D7B0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6015,7 +6015,7 @@ Gfx d_course_royal_raceway_packed_dl_9988[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0401D870, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_MIRROR | G_TX_WRAP, 6, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x007C),
@@ -6025,7 +6025,7 @@ Gfx d_course_royal_raceway_packed_dl_9988[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0401D8B0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6041,7 +6041,7 @@ Gfx d_course_royal_raceway_packed_dl_9A38[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0401D8F0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6057,9 +6057,9 @@ Gfx d_course_royal_raceway_packed_dl_9A98[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0401D930, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6075,7 +6075,7 @@ Gfx d_course_royal_raceway_packed_dl_9B08[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0401D9F0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6091,8 +6091,8 @@ Gfx d_course_royal_raceway_packed_dl_9B68[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0401DA30, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6108,10 +6108,10 @@ Gfx d_course_royal_raceway_packed_dl_9BD0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0401DAB0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6127,9 +6127,9 @@ Gfx d_course_royal_raceway_packed_dl_9C48[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0401DBB0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6145,8 +6145,8 @@ Gfx d_course_royal_raceway_packed_dl_9CB8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0401DC70, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6182,10 +6182,10 @@ Gfx d_course_royal_raceway_packed_dl_9DA0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0401DE20, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6201,11 +6201,11 @@ Gfx d_course_royal_raceway_packed_dl_9E18[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0401DF20, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6221,10 +6221,10 @@ Gfx d_course_royal_raceway_packed_dl_9E98[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0401E060, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6240,9 +6240,9 @@ Gfx d_course_royal_raceway_packed_dl_9F10[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0401E160, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6258,9 +6258,9 @@ Gfx d_course_royal_raceway_packed_dl_9F80[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0401E220, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6276,7 +6276,7 @@ Gfx d_course_royal_raceway_packed_dl_9FF0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0401E2E0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6292,7 +6292,7 @@ Gfx d_course_royal_raceway_packed_dl_A050[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0401E320, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6308,10 +6308,10 @@ Gfx d_course_royal_raceway_packed_dl_A0B0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0401E360, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6327,10 +6327,10 @@ Gfx d_course_royal_raceway_packed_dl_A128[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0401E460, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6346,9 +6346,9 @@ Gfx d_course_royal_raceway_packed_dl_A1A0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0401E560, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6364,8 +6364,8 @@ Gfx d_course_royal_raceway_packed_dl_A210[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0401E620, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6381,7 +6381,7 @@ Gfx d_course_royal_raceway_packed_dl_A278[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0401E6A0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6433,7 +6433,7 @@ Gfx d_course_royal_raceway_packed_dl_A3C8[] =
     gsSPVertex(0x0401E6E0, 12, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 2, 1, 0),
     gsSP2Triangles(4, 5, 6, 0, 6, 5, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6449,11 +6449,11 @@ Gfx d_course_royal_raceway_packed_dl_A438[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0401E7A0, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6469,10 +6469,10 @@ Gfx d_course_royal_raceway_packed_dl_A4B8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0401E8E0, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 17, 19, 18, 0),
     gsSPEndDisplayList(),
 };
@@ -6507,9 +6507,9 @@ Gfx d_course_royal_raceway_packed_dl_A5A0[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0401EA90, 16, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6535,7 +6535,7 @@ Gfx d_course_royal_raceway_packed_dl_A648[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0401EB90, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6551,9 +6551,9 @@ Gfx d_course_royal_raceway_packed_dl_A6A8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x0401EBD0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6603,7 +6603,7 @@ Gfx d_course_royal_raceway_packed_dl_A7D8[] =
     gsSPVertex(0x0401EDE0, 17, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 0, 2, 0),
     gsSP2Triangles(0, 3, 4, 0, 5, 2, 1, 0),
-    gsSP1Quadrangle(6, 7, 2, 5, 0),
+    gsSP2Triangles(6, 7, 2, 0, 6, 2, 5, 0),
     gsSP2Triangles(7, 3, 2, 0, 8, 3, 7, 0),
     gsSP2Triangles(4, 3, 9, 0, 8, 9, 3, 0),
     gsSP2Triangles(10, 11, 12, 0, 13, 12, 11, 0),
@@ -6646,8 +6646,8 @@ Gfx d_course_royal_raceway_packed_dl_A8F8[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x0401F000, 13, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 7, 6, 9, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 7, 6, 0, 8, 6, 9, 0),
     gsSP1Triangle(10, 11, 12, 0),
     gsSPEndDisplayList(),
 };
@@ -6891,36 +6891,36 @@ Gfx d_course_royal_raceway_packed_dl_AF28[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x04020200, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 1, 0, 5, 0),
-    gsSP1Quadrangle(3, 2, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 9, 8, 0),
-    gsSP1Quadrangle(14, 4, 5, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(13, 12, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 23, 22, 0),
-    gsSP1Quadrangle(25, 24, 28, 29, 0),
-    gsSP1Quadrangle(29, 28, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 1, 0, 0, 4, 0, 5, 0),
+    gsSP2Triangles(3, 2, 6, 0, 3, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 9, 0, 12, 9, 8, 0),
+    gsSP2Triangles(14, 4, 5, 0, 14, 5, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(13, 12, 20, 0, 13, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 23, 0, 26, 23, 22, 0),
+    gsSP2Triangles(25, 24, 28, 0, 25, 28, 29, 0),
+    gsSP2Triangles(29, 28, 30, 0, 29, 30, 31, 0),
     gsSPVertex(0x04020400, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
     gsSP2Triangles(6, 7, 8, 0, 9, 10, 11, 0),
     gsSP2Triangles(9, 11, 12, 0, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(6, 16, 19, 7, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(21, 13, 15, 22, 0),
-    gsSP1Quadrangle(24, 25, 10, 9, 0),
-    gsSP1Quadrangle(12, 11, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(6, 16, 19, 0, 6, 19, 7, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(21, 13, 15, 0, 21, 15, 22, 0),
+    gsSP2Triangles(24, 25, 10, 0, 24, 10, 9, 0),
+    gsSP2Triangles(12, 11, 26, 0, 12, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04020600, 18, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 0, 3, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 0, 3, 0, 12, 3, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
     gsSPEndDisplayList(),
 };
 
diff --git a/courses/star_cup/sherbet_land/course_data.inc.c b/courses/star_cup/sherbet_land/course_data.inc.c
index 3f71698e1..45838986c 100644
--- a/courses/star_cup/sherbet_land/course_data.inc.c
+++ b/courses/star_cup/sherbet_land/course_data.inc.c
@@ -4045,14 +4045,14 @@ Gfx d_course_sherbet_land_dl_85B0[] =
     gsSP2Triangles(6, 8, 10, 0, 10, 3, 6, 0),
     gsSP2Triangles(11, 8, 7, 0, 12, 2, 3, 0),
     gsSP2Triangles(13, 11, 7, 0, 12, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 14, 18, 0),
+    gsSP2Triangles(16, 17, 14, 0, 16, 14, 18, 0),
     gsSP2Triangles(17, 15, 14, 0, 12, 19, 14, 0),
     gsSP2Triangles(14, 19, 18, 0, 12, 20, 19, 0),
     gsSP2Triangles(18, 19, 20, 0, 21, 11, 18, 0),
     gsSP2Triangles(20, 21, 18, 0, 16, 18, 11, 0),
     gsSP2Triangles(12, 15, 2, 0, 13, 16, 11, 0),
     gsSP2Triangles(13, 17, 16, 0, 22, 17, 13, 0),
-    gsSP1Quadrangle(13, 7, 9, 22, 0),
+    gsSP2Triangles(13, 7, 9, 0, 13, 9, 22, 0),
     gsSP2Triangles(5, 22, 9, 0, 17, 22, 23, 0),
     gsSP2Triangles(22, 5, 23, 0, 15, 17, 23, 0),
     gsSP2Triangles(0, 23, 5, 0, 23, 0, 15, 0),
@@ -4141,7 +4141,7 @@ Gfx d_course_sherbet_land_dl_8930[] =
     gsSPVertex(d_course_sherbet_land_penguin_right_foot_model, 15, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 4, 0),
     gsSP2Triangles(4, 5, 6, 0, 6, 7, 2, 0),
-    gsSP1Quadrangle(1, 4, 6, 2, 0),
+    gsSP2Triangles(1, 4, 6, 0, 1, 6, 2, 0),
     gsSP2Triangles(8, 9, 10, 0, 1, 0, 4, 0),
     gsSP2Triangles(8, 10, 11, 0, 2, 12, 0, 0),
     gsSP2Triangles(0, 12, 3, 0, 6, 5, 7, 0),
diff --git a/courses/star_cup/sherbet_land/packed.inc.c b/courses/star_cup/sherbet_land/packed.inc.c
index c3b121972..57ff43037 100644
--- a/courses/star_cup/sherbet_land/packed.inc.c
+++ b/courses/star_cup/sherbet_land/packed.inc.c
@@ -20,7 +20,7 @@ Gfx d_course_sherbet_land_packed_dl_0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000000, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 6, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x007C),
@@ -30,7 +30,7 @@ Gfx d_course_sherbet_land_packed_dl_0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04000040, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -48,7 +48,7 @@ Gfx d_course_sherbet_land_packed_dl_C0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000080, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 6, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x007C),
@@ -58,7 +58,7 @@ Gfx d_course_sherbet_land_packed_dl_C0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040000C0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -76,7 +76,7 @@ Gfx d_course_sherbet_land_packed_dl_180[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000100, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 6, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x007C),
@@ -86,7 +86,7 @@ Gfx d_course_sherbet_land_packed_dl_180[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04000140, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -104,7 +104,7 @@ Gfx d_course_sherbet_land_packed_dl_240[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000180, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 6, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x007C),
@@ -114,7 +114,7 @@ Gfx d_course_sherbet_land_packed_dl_240[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040001C0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -174,8 +174,8 @@ Gfx d_course_sherbet_land_packed_dl_348[] =
     gsSP2Triangles(14, 25, 26, 0, 20, 27, 28, 0),
     gsSP1Triangle(29, 30, 31, 0),
     gsSPVertex(0x04000800, 11, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP1Triangle(8, 9, 10, 0),
     gsSPEndDisplayList(),
 };
@@ -221,9 +221,9 @@ Gfx d_course_sherbet_land_packed_dl_470[] =
     gsSP2Triangles(24, 26, 27, 0, 28, 29, 30, 0),
     gsSP1Triangle(28, 30, 31, 0),
     gsSPVertex(0x040010A0, 19, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
     gsSP2Triangles(14, 15, 16, 0, 10, 17, 18, 0),
     gsSPEndDisplayList(),
 };
@@ -269,10 +269,10 @@ Gfx d_course_sherbet_land_packed_dl_5D0[] =
     gsSPVertex(0x04001970, 27, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(6, 7, 5, 0, 8, 9, 10, 0),
-    gsSP1Quadrangle(11, 12, 13, 14, 0),
-    gsSP1Quadrangle(15, 16, 17, 18, 0),
-    gsSP1Quadrangle(19, 20, 21, 22, 0),
-    gsSP1Quadrangle(23, 24, 25, 26, 0),
+    gsSP2Triangles(11, 12, 13, 0, 11, 13, 14, 0),
+    gsSP2Triangles(15, 16, 17, 0, 15, 17, 18, 0),
+    gsSP2Triangles(19, 20, 21, 0, 19, 21, 22, 0),
+    gsSP2Triangles(23, 24, 25, 0, 23, 25, 26, 0),
     gsSPEndDisplayList(),
 };
 
@@ -297,7 +297,7 @@ Gfx d_course_sherbet_land_packed_dl_730[] =
     gsSPVertex(0x04001D20, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(6, 7, 8, 0, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 19, 20, 21, 0),
     gsSP2Triangles(18, 22, 23, 0, 24, 25, 26, 0),
     gsSP2Triangles(27, 28, 18, 0, 29, 30, 31, 0),
@@ -305,15 +305,15 @@ Gfx d_course_sherbet_land_packed_dl_730[] =
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(6, 7, 8, 0, 9, 10, 0, 0),
     gsSP2Triangles(11, 12, 13, 0, 14, 15, 16, 0),
-    gsSP1Quadrangle(17, 18, 19, 20, 0),
-    gsSP1Quadrangle(21, 22, 23, 24, 0),
+    gsSP2Triangles(17, 18, 19, 0, 17, 19, 20, 0),
+    gsSP2Triangles(21, 22, 23, 0, 21, 23, 24, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05003800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040020B0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -351,11 +351,11 @@ Gfx d_course_sherbet_land_packed_dl_858[] =
     gsSP1Triangle(27, 28, 29, 0),
     gsSPVertex(0x040026A0, 31, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsSP2Triangles(10, 11, 12, 0, 13, 14, 15, 0),
     gsSP2Triangles(6, 16, 17, 0, 18, 19, 20, 0),
     gsSP2Triangles(18, 20, 21, 0, 10, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSP1Triangle(28, 29, 30, 0),
     gsSPVertex(0x04002890, 6, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
@@ -400,7 +400,7 @@ Gfx d_course_sherbet_land_packed_dl_9A0[] =
     gsSP2Triangles(12, 13, 14, 0, 15, 16, 14, 0),
     gsSP2Triangles(11, 17, 18, 0, 19, 20, 21, 0),
     gsSP2Triangles(22, 23, 24, 0, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x040030C0, 23, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(3, 5, 6, 0, 7, 8, 9, 0),
@@ -445,7 +445,7 @@ Gfx d_course_sherbet_land_packed_dl_B00[] =
     gsSPVertex(0x04003800, 29, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(6, 7, 2, 0, 8, 9, 10, 0),
-    gsSP1Quadrangle(11, 12, 13, 14, 0),
+    gsSP2Triangles(11, 12, 13, 0, 11, 13, 14, 0),
     gsSP2Triangles(15, 16, 17, 0, 18, 19, 20, 0),
     gsSP2Triangles(18, 20, 21, 0, 22, 23, 24, 0),
     gsSP2Triangles(22, 24, 25, 0, 26, 27, 28, 0),
@@ -479,15 +479,15 @@ Gfx d_course_sherbet_land_packed_dl_C30[] =
     gsSP1Triangle(27, 28, 29, 0),
     gsSPVertex(0x04003DA0, 14, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05003800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04003E80, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -518,7 +518,7 @@ Gfx d_course_sherbet_land_packed_dl_D90[] =
     gsSPVertex(0x04003EC0, 16, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(6, 7, 8, 0, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -538,7 +538,7 @@ Gfx d_course_sherbet_land_packed_dl_E00[] =
     gsSP2Triangles(6, 7, 8, 0, 9, 10, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 15, 16, 17, 0),
     gsSP2Triangles(15, 17, 18, 0, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
     gsSP2Triangles(26, 27, 28, 0, 29, 30, 31, 0),
     gsSPVertex(0x040041C0, 7, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
@@ -705,7 +705,7 @@ Gfx d_course_sherbet_land_packed_dl_1220[] =
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(6, 7, 8, 0, 9, 6, 8, 0),
     gsSP2Triangles(10, 11, 12, 0, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSP2Triangles(20, 21, 22, 0, 23, 24, 25, 0),
     gsSP2Triangles(26, 27, 28, 0, 29, 30, 31, 0),
     gsSPVertex(0x04004E40, 15, 0),
@@ -728,10 +728,10 @@ Gfx d_course_sherbet_land_packed_dl_12C8[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04004F30, 31, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsSP2Triangles(10, 9, 8, 0, 11, 12, 13, 0),
     gsSP2Triangles(14, 15, 16, 0, 16, 15, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
     gsSP2Triangles(22, 23, 24, 0, 25, 26, 27, 0),
     gsSP1Triangle(28, 29, 30, 0),
     gsSPVertex(0x04005120, 9, 0),
@@ -804,9 +804,9 @@ Gfx d_course_sherbet_land_packed_dl_14B0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040053F0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -822,10 +822,10 @@ Gfx d_course_sherbet_land_packed_dl_1520[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040054B0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -841,16 +841,16 @@ Gfx d_course_sherbet_land_packed_dl_1598[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040055B0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x040057B0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -866,7 +866,7 @@ Gfx d_course_sherbet_land_packed_dl_1640[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040057F0, 13, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(0, 4, 1, 0, 5, 6, 7, 0),
     gsSP2Triangles(5, 7, 8, 0, 9, 10, 11, 0),
     gsSP1Triangle(9, 11, 12, 0),
@@ -885,8 +885,8 @@ Gfx d_course_sherbet_land_packed_dl_16B8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040058C0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -902,10 +902,10 @@ Gfx d_course_sherbet_land_packed_dl_1720[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04005940, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -921,8 +921,8 @@ Gfx d_course_sherbet_land_packed_dl_1798[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04005A40, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -938,9 +938,9 @@ Gfx d_course_sherbet_land_packed_dl_1800[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04005AC0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -956,9 +956,9 @@ Gfx d_course_sherbet_land_packed_dl_1870[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04005B80, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -974,7 +974,7 @@ Gfx d_course_sherbet_land_packed_dl_18E0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04005C40, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1005,9 +1005,9 @@ Gfx d_course_sherbet_land_packed_dl_1998[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04005C80, 11, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 5, 7, 6, 0),
-    gsSP1Quadrangle(0, 6, 8, 1, 0),
+    gsSP2Triangles(0, 6, 8, 0, 0, 8, 1, 0),
     gsSP2Triangles(9, 8, 6, 0, 10, 9, 6, 0),
     gsSP1Triangle(7, 10, 6, 0),
     gsSPEndDisplayList(),
@@ -1025,7 +1025,7 @@ Gfx d_course_sherbet_land_packed_dl_1A18[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04005D30, 11, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(0, 4, 1, 0, 1, 4, 5, 0),
     gsSP2Triangles(1, 5, 6, 0, 6, 5, 7, 0),
     gsSP2Triangles(6, 7, 8, 0, 7, 9, 10, 0),
@@ -1066,9 +1066,9 @@ Gfx d_course_sherbet_land_packed_dl_1B20[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04005EE0, 10, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(7, 6, 8, 9, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(7, 6, 8, 0, 7, 8, 9, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -1078,7 +1078,7 @@ Gfx d_course_sherbet_land_packed_dl_1B20[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04005F80, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1112,10 +1112,10 @@ Gfx d_course_sherbet_land_packed_dl_1C50[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04006040, 13, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(5, 8, 6, 0, 9, 10, 11, 0),
-    gsSP1Quadrangle(10, 12, 4, 11, 0),
+    gsSP2Triangles(10, 12, 4, 0, 10, 4, 11, 0),
     gsSP2Triangles(11, 1, 0, 0, 4, 7, 11, 0),
     gsSP1Triangle(7, 1, 11, 0),
     gsSPEndDisplayList(),
@@ -1170,10 +1170,10 @@ Gfx d_course_sherbet_land_packed_dl_1DC0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04006220, 11, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 1, 0, 0, 3, 2, 5, 0),
     gsSP2Triangles(3, 5, 6, 0, 6, 5, 7, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsSP1Triangle(6, 9, 10, 0),
     gsSPEndDisplayList(),
 };
@@ -1192,8 +1192,8 @@ Gfx d_course_sherbet_land_packed_dl_1E40[] =
     gsSPVertex(0x040062D0, 10, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 4, 0),
     gsSP2Triangles(2, 1, 4, 0, 3, 5, 4, 0),
-    gsSP1Quadrangle(6, 7, 5, 3, 0),
-    gsSP1Quadrangle(8, 9, 7, 6, 0),
+    gsSP2Triangles(6, 7, 5, 0, 6, 5, 3, 0),
+    gsSP2Triangles(8, 9, 7, 0, 8, 7, 6, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1224,7 +1224,7 @@ Gfx d_course_sherbet_land_packed_dl_1F10[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04006370, 5, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP1Triangle(0, 4, 1, 0),
     gsSPEndDisplayList(),
 };
@@ -1333,7 +1333,7 @@ Gfx d_course_sherbet_land_packed_dl_21B0[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04006620, 7, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
-    gsSP1Quadrangle(2, 3, 4, 5, 0),
+    gsSP2Triangles(2, 3, 4, 0, 2, 4, 5, 0),
     gsSP1Triangle(2, 5, 6, 0),
     gsSPEndDisplayList(),
 };
@@ -1401,26 +1401,26 @@ Gfx d_course_sherbet_land_packed_dl_2358[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04006790, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04006990, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04006B90, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1436,26 +1436,26 @@ Gfx d_course_sherbet_land_packed_dl_2450[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04006C10, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04006E10, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04007010, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1471,26 +1471,26 @@ Gfx d_course_sherbet_land_packed_dl_2548[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04007090, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04007290, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04007490, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1506,26 +1506,26 @@ Gfx d_course_sherbet_land_packed_dl_2640[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04007510, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04007710, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04007910, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1542,7 +1542,7 @@ Gfx d_course_sherbet_land_packed_dl_2760[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x04007990, 9, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 3, 2, 0, 5, 4, 2, 0),
     gsSP2Triangles(5, 2, 6, 0, 7, 8, 5, 0),
     gsSP1Triangle(7, 5, 6, 0),
@@ -1570,21 +1570,21 @@ Gfx d_course_sherbet_land_packed_dl_27A8[] =
     gsSP2Triangles(13, 18, 16, 0, 19, 13, 20, 0),
     gsSP2Triangles(19, 20, 21, 0, 13, 15, 22, 0),
     gsSP2Triangles(13, 22, 20, 0, 15, 14, 23, 0),
-    gsSP1Quadrangle(15, 24, 25, 22, 0),
+    gsSP2Triangles(15, 24, 25, 0, 15, 25, 22, 0),
     gsSP2Triangles(15, 23, 24, 0, 4, 26, 27, 0),
-    gsSP1Quadrangle(4, 27, 28, 6, 0),
+    gsSP2Triangles(4, 27, 28, 0, 4, 28, 6, 0),
     gsSP2Triangles(4, 8, 26, 0, 29, 26, 30, 0),
-    gsSP1Quadrangle(27, 26, 29, 31, 0),
+    gsSP2Triangles(27, 26, 29, 0, 27, 29, 31, 0),
     gsSP1Triangle(27, 31, 28, 0),
     gsSPVertex(0x04007C20, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 2, 3, 0, 0),
     gsSP2Triangles(2, 4, 3, 0, 0, 5, 1, 0),
     gsSP2Triangles(0, 6, 5, 0, 0, 7, 6, 0),
     gsSP2Triangles(0, 3, 7, 0, 8, 9, 10, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 10, 13, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 10, 0, 14, 10, 13, 0),
     gsSP2Triangles(8, 16, 9, 0, 17, 18, 19, 0),
-    gsSP1Quadrangle(17, 19, 20, 21, 0),
+    gsSP2Triangles(17, 19, 20, 0, 17, 20, 21, 0),
     gsSP2Triangles(17, 22, 18, 0, 23, 17, 24, 0),
     gsSP2Triangles(23, 24, 25, 0, 17, 21, 26, 0),
     gsSP2Triangles(17, 26, 24, 0, 27, 18, 22, 0),
@@ -1599,15 +1599,15 @@ Gfx d_course_sherbet_land_packed_dl_27A8[] =
     gsSP2Triangles(2, 3, 0, 0, 2, 1, 8, 0),
     gsSP2Triangles(2, 8, 9, 0, 2, 10, 3, 0),
     gsSP2Triangles(9, 10, 2, 0, 11, 12, 13, 0),
-    gsSP1Quadrangle(11, 13, 14, 15, 0),
-    gsSP1Quadrangle(13, 16, 17, 14, 0),
+    gsSP2Triangles(11, 13, 14, 0, 11, 14, 15, 0),
+    gsSP2Triangles(13, 16, 17, 0, 13, 17, 14, 0),
     gsSP2Triangles(18, 19, 20, 0, 18, 21, 22, 0),
     gsSP2Triangles(18, 23, 24, 0, 25, 19, 18, 0),
     gsSP2Triangles(25, 18, 22, 0, 18, 24, 21, 0),
     gsSP2Triangles(19, 26, 20, 0, 27, 19, 25, 0),
     gsSP2Triangles(28, 20, 29, 0, 20, 30, 31, 0),
     gsSPVertex(0x04008020, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(0, 4, 1, 0, 5, 4, 0, 0),
     gsSP2Triangles(0, 6, 7, 0, 0, 6, 8, 0),
     gsSP2Triangles(3, 9, 0, 0, 5, 0, 10, 0),
@@ -1616,8 +1616,8 @@ Gfx d_course_sherbet_land_packed_dl_27A8[] =
     gsSP2Triangles(15, 12, 11, 0, 11, 13, 3, 0),
     gsSP2Triangles(6, 12, 15, 0, 16, 13, 17, 0),
     gsSP2Triangles(16, 17, 18, 0, 3, 13, 16, 0),
-    gsSP1Quadrangle(19, 18, 17, 20, 0),
-    gsSP1Quadrangle(21, 19, 20, 22, 0),
+    gsSP2Triangles(19, 18, 17, 0, 19, 17, 20, 0),
+    gsSP2Triangles(21, 19, 20, 0, 21, 20, 22, 0),
     gsSP2Triangles(21, 22, 23, 0, 24, 21, 23, 0),
     gsSP2Triangles(9, 3, 16, 0, 7, 6, 15, 0),
     gsSP2Triangles(25, 26, 27, 0, 25, 28, 26, 0),
@@ -1625,22 +1625,22 @@ Gfx d_course_sherbet_land_packed_dl_27A8[] =
     gsSP2Triangles(2, 1, 14, 0, 26, 29, 30, 0),
     gsSP1Triangle(27, 23, 31, 0),
     gsSPVertex(0x04008220, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 0, 0, 5, 6, 0, 0),
-    gsSP1Quadrangle(2, 7, 8, 3, 0),
+    gsSP2Triangles(2, 7, 8, 0, 2, 8, 3, 0),
     gsSP2Triangles(9, 6, 5, 0, 10, 11, 12, 0),
     gsSP2Triangles(10, 12, 13, 0, 11, 14, 15, 0),
-    gsSP1Quadrangle(11, 15, 16, 12, 0),
+    gsSP2Triangles(11, 15, 16, 0, 11, 16, 12, 0),
     gsSP2Triangles(17, 18, 19, 0, 17, 20, 21, 0),
     gsSP2Triangles(17, 22, 20, 0, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 24, 23, 0),
+    gsSP2Triangles(26, 27, 24, 0, 26, 24, 23, 0),
     gsSP2Triangles(28, 23, 29, 0, 23, 25, 29, 0),
     gsSP2Triangles(28, 26, 23, 0, 7, 27, 26, 0),
     gsSP2Triangles(7, 26, 8, 0, 24, 30, 31, 0),
     gsSPVertex(0x04008420, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 1, 4, 0),
     gsSP2Triangles(2, 1, 5, 0, 3, 4, 6, 0),
-    gsSP1Quadrangle(3, 6, 7, 8, 0),
+    gsSP2Triangles(3, 6, 7, 0, 3, 7, 8, 0),
     gsSP2Triangles(4, 0, 9, 0, 6, 4, 10, 0),
     gsSP2Triangles(4, 9, 10, 0, 11, 0, 2, 0),
     gsSP2Triangles(6, 10, 7, 0, 7, 11, 2, 0),
@@ -1651,26 +1651,26 @@ Gfx d_course_sherbet_land_packed_dl_27A8[] =
     gsSP2Triangles(21, 22, 23, 0, 17, 12, 13, 0),
     gsSP2Triangles(17, 13, 22, 0, 8, 17, 19, 0),
     gsSP2Triangles(18, 20, 24, 0, 8, 19, 5, 0),
-    gsSP1Quadrangle(25, 26, 27, 28, 0),
+    gsSP2Triangles(25, 26, 27, 0, 25, 27, 28, 0),
     gsSP2Triangles(25, 28, 29, 0, 30, 25, 29, 0),
     gsSP1Triangle(30, 29, 31, 0),
     gsSPVertex(0x04008620, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
     gsSP2Triangles(6, 7, 1, 0, 1, 8, 4, 0),
     gsSP2Triangles(1, 7, 8, 0, 9, 6, 1, 0),
-    gsSP1Quadrangle(4, 10, 11, 12, 0),
+    gsSP2Triangles(4, 10, 11, 0, 4, 11, 12, 0),
     gsSP2Triangles(4, 12, 5, 0, 10, 4, 13, 0),
     gsSP2Triangles(4, 8, 13, 0, 10, 14, 15, 0),
     gsSP2Triangles(10, 15, 11, 0, 16, 6, 9, 0),
     gsSP2Triangles(17, 18, 16, 0, 16, 18, 6, 0),
     gsSP2Triangles(19, 20, 21, 0, 19, 22, 20, 0),
-    gsSP1Quadrangle(14, 23, 24, 15, 0),
-    gsSP1Quadrangle(25, 26, 27, 28, 0),
+    gsSP2Triangles(14, 23, 24, 0, 14, 24, 15, 0),
+    gsSP2Triangles(25, 26, 27, 0, 25, 27, 28, 0),
     gsSP1Triangle(25, 28, 29, 0),
     gsSPVertex(0x04008800, 7, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 6, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 6, 0),
     gsSP1Triangle(3, 2, 6, 0),
     gsSPEndDisplayList(),
 };
@@ -1694,7 +1694,7 @@ Gfx d_course_sherbet_land_packed_dl_2B58[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04008870, 16, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsSP2Triangles(10, 11, 12, 0, 13, 14, 15, 0),
     gsSPEndDisplayList(),
 };
@@ -1879,7 +1879,7 @@ Gfx d_course_sherbet_land_packed_dl_2FE8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040095D0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(10, 11, 12, 0, 13, 14, 15, 0),
     gsSPEndDisplayList(),
@@ -1916,7 +1916,7 @@ Gfx d_course_sherbet_land_packed_dl_30C0[] =
     gsSPVertex(0x04009790, 31, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(3, 6, 4, 0, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
     gsSP2Triangles(14, 15, 16, 0, 15, 17, 16, 0),
     gsSP2Triangles(18, 14, 16, 0, 19, 20, 21, 0),
     gsSP2Triangles(22, 23, 24, 0, 25, 26, 27, 0),
@@ -2001,9 +2001,9 @@ Gfx d_course_sherbet_land_packed_dl_32F8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04009ED0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2019,10 +2019,10 @@ Gfx d_course_sherbet_land_packed_dl_3368[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04009F90, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2038,16 +2038,16 @@ Gfx d_course_sherbet_land_packed_dl_33E0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400A090, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0400A290, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2063,7 +2063,7 @@ Gfx d_course_sherbet_land_packed_dl_3488[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400A2D0, 13, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(2, 4, 3, 0, 5, 6, 7, 0),
     gsSP2Triangles(5, 7, 8, 0, 9, 10, 11, 0),
     gsSP1Triangle(9, 11, 12, 0),
@@ -2082,8 +2082,8 @@ Gfx d_course_sherbet_land_packed_dl_3500[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400A3A0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2099,10 +2099,10 @@ Gfx d_course_sherbet_land_packed_dl_3568[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400A420, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2118,8 +2118,8 @@ Gfx d_course_sherbet_land_packed_dl_35E0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400A520, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2135,9 +2135,9 @@ Gfx d_course_sherbet_land_packed_dl_3648[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400A5A0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2153,9 +2153,9 @@ Gfx d_course_sherbet_land_packed_dl_36B8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400A660, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2171,7 +2171,7 @@ Gfx d_course_sherbet_land_packed_dl_3728[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400A720, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
diff --git a/courses/star_cup/wario_stadium/course_data.inc.c b/courses/star_cup/wario_stadium/course_data.inc.c
index a0e465d59..8b548b1b4 100644
--- a/courses/star_cup/wario_stadium/course_data.inc.c
+++ b/courses/star_cup/wario_stadium/course_data.inc.c
@@ -4805,48 +4805,48 @@ Gfx d_course_wario_stadium_dl_C890[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(d_course_wario_stadium_sign_head_model1, 13, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 2, 1, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 2, 0, 4, 2, 1, 0),
     gsSP2Triangles(4, 1, 6, 0, 3, 2, 5, 0),
     gsSP2Triangles(3, 5, 7, 0, 8, 9, 10, 0),
-    gsSP1Quadrangle(8, 10, 11, 12, 0),
-    gsSP1Quadrangle(5, 4, 8, 7, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 12, 0),
+    gsSP2Triangles(5, 4, 8, 0, 5, 8, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, d_course_wario_stadium_sign_bottom_left),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(d_course_wario_stadium_sign_head_model2, 17, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(0, 3, 4, 0, 3, 5, 6, 0),
     gsSP2Triangles(3, 6, 7, 0, 8, 9, 10, 0),
-    gsSP1Quadrangle(8, 10, 11, 12, 0),
-    gsSP1Quadrangle(13, 14, 15, 16, 0),
-    gsSP1Quadrangle(14, 7, 6, 15, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 12, 0),
+    gsSP2Triangles(13, 14, 15, 0, 13, 15, 16, 0),
+    gsSP2Triangles(14, 7, 6, 0, 14, 6, 15, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, d_course_wario_stadium_sign_top_right),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(d_course_wario_stadium_sign_head_model3, 13, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(0, 3, 4, 0, 5, 6, 7, 0),
-    gsSP1Quadrangle(5, 7, 8, 9, 0),
-    gsSP1Quadrangle(8, 10, 11, 9, 0),
-    gsSP1Quadrangle(5, 9, 11, 12, 0),
-    gsSP1Quadrangle(1, 6, 5, 12, 0),
+    gsSP2Triangles(5, 7, 8, 0, 5, 8, 9, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0),
+    gsSP2Triangles(5, 9, 11, 0, 5, 11, 12, 0),
+    gsSP2Triangles(1, 6, 5, 0, 1, 5, 12, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, d_course_wario_stadium_sign_bottom_right),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(d_course_wario_stadium_sign_head_model4, 17, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
-    gsSP1Quadrangle(3, 6, 7, 0, 0),
-    gsSP1Quadrangle(8, 9, 10, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
+    gsSP2Triangles(3, 6, 7, 0, 3, 7, 0, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 7, 0),
     gsSP2Triangles(8, 7, 11, 0, 12, 13, 14, 0),
-    gsSP1Quadrangle(12, 14, 15, 16, 0),
+    gsSP2Triangles(12, 14, 15, 0, 12, 15, 16, 0),
     gsSPEndDisplayList(),
 };
 
diff --git a/courses/star_cup/wario_stadium/packed.inc.c b/courses/star_cup/wario_stadium/packed.inc.c
index bb5369ee9..aca1126de 100644
--- a/courses/star_cup/wario_stadium/packed.inc.c
+++ b/courses/star_cup/wario_stadium/packed.inc.c
@@ -18,7 +18,7 @@ Gfx d_course_wario_stadium_packed_dl_0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000000, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -34,7 +34,7 @@ Gfx d_course_wario_stadium_packed_dl_60[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000040, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -50,7 +50,7 @@ Gfx d_course_wario_stadium_packed_dl_C0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000080, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -66,7 +66,7 @@ Gfx d_course_wario_stadium_packed_dl_120[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040000C0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -82,7 +82,7 @@ Gfx d_course_wario_stadium_packed_dl_180[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000100, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -98,7 +98,7 @@ Gfx d_course_wario_stadium_packed_dl_1E0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000140, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -130,7 +130,7 @@ Gfx d_course_wario_stadium_packed_dl_2A0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040001C0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -146,7 +146,7 @@ Gfx d_course_wario_stadium_packed_dl_300[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000200, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -199,12 +199,12 @@ Gfx d_course_wario_stadium_packed_dl_428[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000290, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 11, 8, 10, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 17, 19, 18, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -214,7 +214,7 @@ Gfx d_course_wario_stadium_packed_dl_428[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000410, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -230,12 +230,12 @@ Gfx d_course_wario_stadium_packed_dl_500[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000450, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -261,7 +261,7 @@ Gfx d_course_wario_stadium_packed_dl_5D8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000610, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -278,8 +278,8 @@ Gfx d_course_wario_stadium_packed_dl_638[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000650, 12, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -289,7 +289,7 @@ Gfx d_course_wario_stadium_packed_dl_638[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000710, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -305,8 +305,8 @@ Gfx d_course_wario_stadium_packed_dl_6F8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000750, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 9, 11, 10, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
@@ -334,9 +334,9 @@ Gfx d_course_wario_stadium_packed_dl_7C0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000860, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -346,7 +346,7 @@ Gfx d_course_wario_stadium_packed_dl_7C0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000920, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -362,9 +362,9 @@ Gfx d_course_wario_stadium_packed_dl_880[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000960, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -380,9 +380,9 @@ Gfx d_course_wario_stadium_packed_dl_8F0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000A20, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 5, 7, 6, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -398,9 +398,9 @@ Gfx d_course_wario_stadium_packed_dl_960[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000AE0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 5, 7, 6, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -410,7 +410,7 @@ Gfx d_course_wario_stadium_packed_dl_960[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000BA0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -516,9 +516,9 @@ Gfx d_course_wario_stadium_packed_dl_C50[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04000F00, 13, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSP1Triangle(8, 11, 12, 0),
     gsSPEndDisplayList(),
 };
@@ -557,7 +557,7 @@ Gfx d_course_wario_stadium_packed_dl_D50[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040010E0, 15, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 4, 0),
-    gsSP1Quadrangle(0, 4, 5, 1, 0),
+    gsSP2Triangles(0, 4, 5, 0, 0, 5, 1, 0),
     gsSP2Triangles(0, 6, 3, 0, 7, 8, 9, 0),
     gsSP2Triangles(7, 10, 8, 0, 11, 12, 13, 0),
     gsSP1Triangle(12, 14, 13, 0),
@@ -641,9 +641,9 @@ Gfx d_course_wario_stadium_packed_dl_F38[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040013D0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -659,8 +659,8 @@ Gfx d_course_wario_stadium_packed_dl_FA8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04001490, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(8, 9, 10, 0, 11, 10, 9, 0),
     gsSPEndDisplayList(),
 };
@@ -677,9 +677,9 @@ Gfx d_course_wario_stadium_packed_dl_1018[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04001550, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -695,10 +695,10 @@ Gfx d_course_wario_stadium_packed_dl_1088[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04001610, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -734,7 +734,7 @@ Gfx d_course_wario_stadium_packed_dl_1180[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04001820, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -750,12 +750,12 @@ Gfx d_course_wario_stadium_packed_dl_11E0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04001860, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSP2Triangles(24, 25, 26, 0, 5, 27, 28, 0),
     gsSP2Triangles(5, 28, 6, 0, 29, 28, 27, 0),
     gsSP2Triangles(29, 27, 30, 0, 31, 4, 7, 0),
@@ -776,8 +776,8 @@ Gfx d_course_wario_stadium_packed_dl_1290[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04001A90, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -787,7 +787,7 @@ Gfx d_course_wario_stadium_packed_dl_1290[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04001B10, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -803,12 +803,12 @@ Gfx d_course_wario_stadium_packed_dl_1348[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04001B50, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(7, 10, 11, 8, 0),
-    gsSP1Quadrangle(10, 12, 13, 11, 0),
-    gsSP1Quadrangle(14, 6, 9, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(7, 10, 11, 0, 7, 11, 8, 0),
+    gsSP2Triangles(10, 12, 13, 0, 10, 13, 11, 0),
+    gsSP2Triangles(14, 6, 9, 0, 14, 9, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -824,12 +824,12 @@ Gfx d_course_wario_stadium_packed_dl_13D0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04001C50, 22, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(17, 20, 21, 18, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(17, 20, 21, 0, 17, 21, 18, 0),
     gsSPEndDisplayList(),
 };
 
@@ -845,9 +845,9 @@ Gfx d_course_wario_stadium_packed_dl_1458[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04001DB0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -863,7 +863,7 @@ Gfx d_course_wario_stadium_packed_dl_14C8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04001E70, 13, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(0, 3, 4, 0, 5, 6, 7, 0),
     gsSP2Triangles(5, 7, 8, 0, 9, 10, 11, 0),
     gsSP1Triangle(9, 11, 12, 0),
@@ -882,9 +882,9 @@ Gfx d_course_wario_stadium_packed_dl_1540[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04001F40, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 4, 7, 8, 0),
-    gsSP1Quadrangle(9, 10, 11, 12, 0),
+    gsSP2Triangles(9, 10, 11, 0, 9, 11, 12, 0),
     gsSP2Triangles(13, 14, 15, 0, 16, 17, 18, 0),
     gsSP2Triangles(16, 18, 19, 0, 8, 7, 20, 0),
     gsSP1Triangle(21, 22, 23, 0),
@@ -904,9 +904,9 @@ Gfx d_course_wario_stadium_packed_dl_15C8[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040020C0, 18, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
     gsSPEndDisplayList(),
 };
 
@@ -922,9 +922,9 @@ Gfx d_course_wario_stadium_packed_dl_1640[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040021E0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -940,7 +940,7 @@ Gfx d_course_wario_stadium_packed_dl_16B0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040022A0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -956,8 +956,8 @@ Gfx d_course_wario_stadium_packed_dl_1710[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040022E0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -973,7 +973,7 @@ Gfx d_course_wario_stadium_packed_dl_1778[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04002360, 15, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(7, 9, 10, 0, 11, 12, 13, 0),
     gsSP1Triangle(11, 13, 14, 0),
@@ -1010,10 +1010,10 @@ Gfx d_course_wario_stadium_packed_dl_1860[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04002530, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1029,9 +1029,9 @@ Gfx d_course_wario_stadium_packed_dl_18D8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04002630, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1047,12 +1047,12 @@ Gfx d_course_wario_stadium_packed_dl_1948[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040026F0, 14, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 4, 7, 0),
-    gsSP1Quadrangle(0, 3, 10, 11, 0),
-    gsSP1Quadrangle(12, 11, 10, 13, 0),
-    gsSP1Quadrangle(1, 6, 5, 2, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 4, 0, 8, 4, 7, 0),
+    gsSP2Triangles(0, 3, 10, 0, 0, 10, 11, 0),
+    gsSP2Triangles(12, 11, 10, 0, 12, 10, 13, 0),
+    gsSP2Triangles(1, 6, 5, 0, 1, 5, 2, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1070,9 +1070,9 @@ Gfx d_course_wario_stadium_packed_dl_19D0[] =
     gsSPVertex(0x040027D0, 20, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(3, 5, 6, 0, 7, 8, 9, 0),
-    gsSP1Quadrangle(7, 10, 11, 8, 0),
+    gsSP2Triangles(7, 10, 11, 0, 7, 11, 8, 0),
     gsSP2Triangles(12, 13, 14, 0, 5, 15, 6, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1088,19 +1088,19 @@ Gfx d_course_wario_stadium_packed_dl_1A50[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04002910, 28, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 0, 3, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 6, 9, 11, 0),
-    gsSP1Quadrangle(5, 10, 11, 4, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(14, 16, 17, 15, 0),
-    gsSP1Quadrangle(1, 18, 19, 2, 0),
-    gsSP1Quadrangle(20, 19, 18, 21, 0),
-    gsSP1Quadrangle(22, 17, 16, 23, 0),
-    gsSP1Quadrangle(24, 22, 23, 25, 0),
-    gsSP1Quadrangle(26, 24, 25, 27, 0),
-    gsSP1Quadrangle(27, 20, 21, 26, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 0, 3, 0, 4, 3, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 6, 9, 0, 10, 9, 11, 0),
+    gsSP2Triangles(5, 10, 11, 0, 5, 11, 4, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(14, 16, 17, 0, 14, 17, 15, 0),
+    gsSP2Triangles(1, 18, 19, 0, 1, 19, 2, 0),
+    gsSP2Triangles(20, 19, 18, 0, 20, 18, 21, 0),
+    gsSP2Triangles(22, 17, 16, 0, 22, 16, 23, 0),
+    gsSP2Triangles(24, 22, 23, 0, 24, 23, 25, 0),
+    gsSP2Triangles(26, 24, 25, 0, 26, 25, 27, 0),
+    gsSP2Triangles(27, 20, 21, 0, 27, 21, 26, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1116,7 +1116,7 @@ Gfx d_course_wario_stadium_packed_dl_1B10[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04002AD0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1132,7 +1132,7 @@ Gfx d_course_wario_stadium_packed_dl_1B70[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04002B10, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1148,9 +1148,9 @@ Gfx d_course_wario_stadium_packed_dl_1BD0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04002B50, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1198,20 +1198,20 @@ Gfx d_course_wario_stadium_packed_dl_1D20[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04002C10, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05003800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04002CD0, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1227,18 +1227,18 @@ Gfx d_course_wario_stadium_packed_dl_1DE8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04002E10, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05003800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04002E90, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1254,12 +1254,12 @@ Gfx d_course_wario_stadium_packed_dl_1EA0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04002F90, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1275,8 +1275,8 @@ Gfx d_course_wario_stadium_packed_dl_1F28[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04003110, 28, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 1, 0, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 1, 0, 0, 4, 0, 5, 0),
     gsSP2Triangles(6, 7, 8, 0, 9, 6, 8, 0),
     gsSP2Triangles(9, 8, 10, 0, 11, 4, 5, 0),
     gsSP2Triangles(11, 5, 12, 0, 13, 14, 15, 0),
@@ -1300,20 +1300,20 @@ Gfx d_course_wario_stadium_packed_dl_1FC8[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040032D0, 16, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05003800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040033D0, 22, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSP2Triangles(18, 20, 19, 0, 20, 21, 19, 0),
     gsSPEndDisplayList(),
 };
@@ -1330,8 +1330,8 @@ Gfx d_course_wario_stadium_packed_dl_20A0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04003530, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1347,21 +1347,21 @@ Gfx d_course_wario_stadium_packed_dl_2108[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040035B0, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(11, 10, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(11, 10, 12, 0, 11, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPVertex(0x04003790, 22, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(19, 18, 20, 21, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(19, 18, 20, 0, 19, 20, 21, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1377,7 +1377,7 @@ Gfx d_course_wario_stadium_packed_dl_21D8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040038F0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1393,7 +1393,7 @@ Gfx d_course_wario_stadium_packed_dl_2238[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04003930, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1409,11 +1409,11 @@ Gfx d_course_wario_stadium_packed_dl_2298[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04003970, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1429,10 +1429,10 @@ Gfx d_course_wario_stadium_packed_dl_2318[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04003AB0, 14, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 5, 4, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 5, 0, 8, 5, 4, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1448,9 +1448,9 @@ Gfx d_course_wario_stadium_packed_dl_2390[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04003B90, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1466,21 +1466,21 @@ Gfx d_course_wario_stadium_packed_dl_2400[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04003C50, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05003800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04003D10, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1496,20 +1496,20 @@ Gfx d_course_wario_stadium_packed_dl_24D0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04003E90, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05003800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04003FD0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1525,19 +1525,19 @@ Gfx d_course_wario_stadium_packed_dl_2598[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04004090, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05003800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04004150, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1553,9 +1553,9 @@ Gfx d_course_wario_stadium_packed_dl_2658[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04004250, 14, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1571,18 +1571,18 @@ Gfx d_course_wario_stadium_packed_dl_26C8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04004330, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05003800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040043B0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1598,20 +1598,20 @@ Gfx d_course_wario_stadium_packed_dl_2780[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040044B0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05003800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040044F0, 28, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1627,17 +1627,17 @@ Gfx d_course_wario_stadium_packed_dl_2848[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040046B0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05003800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040047B0, 11, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
     gsSP1Triangle(7, 9, 10, 0),
     gsSPEndDisplayList(),
@@ -1655,17 +1655,17 @@ Gfx d_course_wario_stadium_packed_dl_2908[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04004860, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05003800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040048A0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1681,9 +1681,9 @@ Gfx d_course_wario_stadium_packed_dl_29B8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040049A0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1699,12 +1699,12 @@ Gfx d_course_wario_stadium_packed_dl_2A28[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04004A60, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 7, 6, 0),
-    gsSP1Quadrangle(5, 4, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 11, 10, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 7, 0, 10, 7, 6, 0),
+    gsSP2Triangles(5, 4, 12, 0, 5, 12, 13, 0),
+    gsSP2Triangles(14, 15, 11, 0, 14, 11, 10, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1720,25 +1720,25 @@ Gfx d_course_wario_stadium_packed_dl_2AB0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04004B60, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05003800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04004CA0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04004EA0, 3, 0),
     gsSP1Triangle(0, 1, 2, 0),
     gsSPEndDisplayList(),
@@ -1756,8 +1756,8 @@ Gfx d_course_wario_stadium_packed_dl_2BB0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04004ED0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1773,8 +1773,8 @@ Gfx d_course_wario_stadium_packed_dl_2C18[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04004F50, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1790,8 +1790,8 @@ Gfx d_course_wario_stadium_packed_dl_2C80[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04004FD0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1807,19 +1807,19 @@ Gfx d_course_wario_stadium_packed_dl_2CE8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04005050, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05003800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04005110, 17, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSP1Triangle(12, 16, 13, 0),
     gsSPEndDisplayList(),
 };
@@ -1906,7 +1906,7 @@ Gfx d_course_wario_stadium_packed_dl_2F78[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04005320, 8, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 2, 0),
-    gsSP1Quadrangle(0, 2, 5, 6, 0),
+    gsSP2Triangles(0, 2, 5, 0, 0, 5, 6, 0),
     gsSP2Triangles(7, 3, 1, 0, 3, 2, 1, 0),
     gsSPEndDisplayList(),
 };
@@ -1923,12 +1923,12 @@ Gfx d_course_wario_stadium_packed_dl_2FE8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040053A0, 13, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(2, 1, 4, 0, 5, 2, 4, 0),
-    gsSP1Quadrangle(2, 6, 7, 3, 0),
+    gsSP2Triangles(2, 6, 7, 0, 2, 7, 3, 0),
     gsSP2Triangles(5, 6, 2, 0, 7, 8, 3, 0),
     gsSP2Triangles(9, 10, 11, 0, 10, 12, 11, 0),
-    gsSP1Quadrangle(12, 5, 4, 11, 0),
+    gsSP2Triangles(12, 5, 4, 0, 12, 4, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -1945,7 +1945,7 @@ Gfx d_course_wario_stadium_packed_dl_3070[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04005470, 11, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 0, 2, 0),
-    gsSP1Quadrangle(2, 4, 5, 6, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 6, 0),
     gsSP2Triangles(1, 7, 2, 0, 7, 4, 2, 0),
     gsSP1Triangle(8, 9, 10, 0),
     gsSPEndDisplayList(),
@@ -1985,7 +1985,7 @@ Gfx d_course_wario_stadium_packed_dl_3160[] =
     gsSP2Triangles(0, 1, 2, 0, 1, 0, 3, 0),
     gsSP2Triangles(1, 4, 2, 0, 5, 6, 1, 0),
     gsSP2Triangles(5, 1, 7, 0, 1, 3, 7, 0),
-    gsSP1Quadrangle(4, 1, 1, 6, 0),
+    gsSP2Triangles(4, 1, 1, 0, 4, 1, 6, 0),
     gsSP2Triangles(4, 6, 8, 0, 6, 9, 10, 0),
     gsSP2Triangles(6, 10, 11, 0, 8, 6, 11, 0),
     gsSP2Triangles(9, 6, 5, 0, 9, 12, 10, 0),
@@ -2022,7 +2022,7 @@ Gfx d_course_wario_stadium_packed_dl_3260[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04005700, 7, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 2, 0, 3, 2, 6, 0),
     gsSP1Triangle(1, 4, 2, 0),
     gsSPEndDisplayList(),
@@ -2061,8 +2061,8 @@ Gfx d_course_wario_stadium_packed_dl_3350[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04005810, 8, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 0, 4, 0),
-    gsSP1Quadrangle(0, 2, 5, 6, 0),
-    gsSP1Quadrangle(0, 6, 7, 4, 0),
+    gsSP2Triangles(0, 2, 5, 0, 0, 5, 6, 0),
+    gsSP2Triangles(0, 6, 7, 0, 0, 7, 4, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2097,8 +2097,8 @@ Gfx d_course_wario_stadium_packed_dl_3438[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04005910, 6, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(0, 3, 4, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2135,7 +2135,7 @@ Gfx d_course_wario_stadium_packed_dl_3518[] =
     gsSPVertex(0x040059F0, 11, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
     gsSP2Triangles(1, 3, 4, 0, 2, 1, 5, 0),
-    gsSP1Quadrangle(2, 5, 6, 7, 0),
+    gsSP2Triangles(2, 5, 6, 0, 2, 6, 7, 0),
     gsSP2Triangles(8, 2, 7, 0, 2, 8, 9, 0),
     gsSP1Triangle(10, 2, 9, 0),
     gsSPEndDisplayList(),
@@ -2153,7 +2153,7 @@ Gfx d_course_wario_stadium_packed_dl_3598[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04005AA0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2207,8 +2207,8 @@ Gfx d_course_wario_stadium_packed_dl_36D0[] =
     gsSP2Triangles(0, 1, 2, 0, 2, 1, 3, 0),
     gsSP2Triangles(1, 4, 5, 0, 3, 1, 6, 0),
     gsSP2Triangles(1, 5, 6, 0, 5, 4, 7, 0),
-    gsSP1Quadrangle(8, 2, 3, 9, 0),
-    gsSP1Quadrangle(3, 6, 10, 9, 0),
+    gsSP2Triangles(8, 2, 3, 0, 8, 3, 9, 0),
+    gsSP2Triangles(3, 6, 10, 0, 3, 10, 9, 0),
     gsSP1Triangle(8, 9, 11, 0),
     gsSPEndDisplayList(),
 };
@@ -2289,7 +2289,7 @@ Gfx d_course_wario_stadium_packed_dl_38F8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04005D80, 5, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP1Triangle(0, 3, 4, 0),
     gsSPEndDisplayList(),
 };
@@ -2306,9 +2306,9 @@ Gfx d_course_wario_stadium_packed_dl_3960[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04005DD0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2324,7 +2324,7 @@ Gfx d_course_wario_stadium_packed_dl_39D0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04005E90, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2340,10 +2340,10 @@ Gfx d_course_wario_stadium_packed_dl_3A30[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04005ED0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2359,7 +2359,7 @@ Gfx d_course_wario_stadium_packed_dl_3AA8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04005FD0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2375,7 +2375,7 @@ Gfx d_course_wario_stadium_packed_dl_3B08[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04006010, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2391,7 +2391,7 @@ Gfx d_course_wario_stadium_packed_dl_3B68[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04006050, 5, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP1Triangle(0, 3, 4, 0),
     gsSPEndDisplayList(),
 };
@@ -2408,9 +2408,9 @@ Gfx d_course_wario_stadium_packed_dl_3BD0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x040060A0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2426,8 +2426,8 @@ Gfx d_course_wario_stadium_packed_dl_3C40[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04006160, 7, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(0, 4, 5, 6, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(0, 4, 5, 0, 0, 5, 6, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2443,8 +2443,8 @@ Gfx d_course_wario_stadium_packed_dl_3CA8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x040061D0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2460,9 +2460,9 @@ Gfx d_course_wario_stadium_packed_dl_3D10[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04006250, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2478,8 +2478,8 @@ Gfx d_course_wario_stadium_packed_dl_3D80[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04006310, 7, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 1, 6, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 1, 0, 4, 1, 6, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2495,7 +2495,7 @@ Gfx d_course_wario_stadium_packed_dl_3DE8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04006380, 5, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP1Triangle(0, 3, 4, 0),
     gsSPEndDisplayList(),
 };
@@ -2530,7 +2530,7 @@ Gfx d_course_wario_stadium_packed_dl_3EC0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040063D0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -2540,7 +2540,7 @@ Gfx d_course_wario_stadium_packed_dl_3EC0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04006410, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2556,7 +2556,7 @@ Gfx d_course_wario_stadium_packed_dl_3F70[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04006450, 11, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 6, 5, 7, 0),
     gsSP2Triangles(6, 7, 8, 0, 9, 10, 5, 0),
     gsSP1Triangle(9, 5, 4, 0),
@@ -2569,7 +2569,7 @@ Gfx d_course_wario_stadium_packed_dl_3F70[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04006500, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2585,7 +2585,7 @@ Gfx d_course_wario_stadium_packed_dl_4038[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04006540, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2601,8 +2601,8 @@ Gfx d_course_wario_stadium_packed_dl_4098[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04006580, 15, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSP2Triangles(4, 8, 5, 0, 8, 9, 10, 0),
     gsSP2Triangles(8, 10, 5, 0, 11, 12, 13, 0),
     gsSP1Triangle(11, 13, 14, 0),
@@ -2615,7 +2615,7 @@ Gfx d_course_wario_stadium_packed_dl_4098[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04006670, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2631,7 +2631,7 @@ Gfx d_course_wario_stadium_packed_dl_4168[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040066B0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -2641,7 +2641,7 @@ Gfx d_course_wario_stadium_packed_dl_4168[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040066F0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2657,7 +2657,7 @@ Gfx d_course_wario_stadium_packed_dl_4218[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04006730, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -2667,7 +2667,7 @@ Gfx d_course_wario_stadium_packed_dl_4218[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04006770, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2683,7 +2683,7 @@ Gfx d_course_wario_stadium_packed_dl_42C8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040067B0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -2693,7 +2693,7 @@ Gfx d_course_wario_stadium_packed_dl_42C8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040067F0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2709,9 +2709,9 @@ Gfx d_course_wario_stadium_packed_dl_4378[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04006830, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -2721,7 +2721,7 @@ Gfx d_course_wario_stadium_packed_dl_4378[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040068F0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2737,7 +2737,7 @@ Gfx d_course_wario_stadium_packed_dl_4438[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04006930, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 6, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x007C),
@@ -2747,7 +2747,7 @@ Gfx d_course_wario_stadium_packed_dl_4438[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04006970, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2763,7 +2763,7 @@ Gfx d_course_wario_stadium_packed_dl_44E8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040069B0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 6, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x007C),
@@ -2773,7 +2773,7 @@ Gfx d_course_wario_stadium_packed_dl_44E8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040069F0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2789,9 +2789,9 @@ Gfx d_course_wario_stadium_packed_dl_4598[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04006A30, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -2801,7 +2801,7 @@ Gfx d_course_wario_stadium_packed_dl_4598[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04006AF0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2817,7 +2817,7 @@ Gfx d_course_wario_stadium_packed_dl_4658[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04006B30, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2833,7 +2833,7 @@ Gfx d_course_wario_stadium_packed_dl_46B8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04006B70, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -2843,7 +2843,7 @@ Gfx d_course_wario_stadium_packed_dl_46B8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04006BB0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2887,21 +2887,21 @@ Gfx d_course_wario_stadium_packed_dl_4808[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04006BF0, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(3, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 0, 3, 7, 0),
-    gsSP1Quadrangle(7, 6, 9, 10, 0),
-    gsSP1Quadrangle(11, 8, 7, 10, 0),
-    gsSP1Quadrangle(12, 8, 11, 13, 0),
-    gsSP1Quadrangle(13, 11, 14, 15, 0),
-    gsSP1Quadrangle(14, 11, 10, 16, 0),
-    gsSP1Quadrangle(17, 0, 8, 12, 0),
-    gsSP1Quadrangle(10, 9, 18, 16, 0),
-    gsSP1Quadrangle(19, 1, 0, 17, 0),
-    gsSP1Quadrangle(20, 21, 1, 19, 0),
-    gsSP1Quadrangle(1, 21, 22, 2, 0),
-    gsSP1Quadrangle(22, 23, 4, 2, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(3, 5, 6, 0, 3, 6, 7, 0),
+    gsSP2Triangles(8, 0, 3, 0, 8, 3, 7, 0),
+    gsSP2Triangles(7, 6, 9, 0, 7, 9, 10, 0),
+    gsSP2Triangles(11, 8, 7, 0, 11, 7, 10, 0),
+    gsSP2Triangles(12, 8, 11, 0, 12, 11, 13, 0),
+    gsSP2Triangles(13, 11, 14, 0, 13, 14, 15, 0),
+    gsSP2Triangles(14, 11, 10, 0, 14, 10, 16, 0),
+    gsSP2Triangles(17, 0, 8, 0, 17, 8, 12, 0),
+    gsSP2Triangles(10, 9, 18, 0, 10, 18, 16, 0),
+    gsSP2Triangles(19, 1, 0, 0, 19, 0, 17, 0),
+    gsSP2Triangles(20, 21, 1, 0, 20, 1, 19, 0),
+    gsSP2Triangles(1, 21, 22, 0, 1, 22, 2, 0),
+    gsSP2Triangles(22, 23, 4, 0, 22, 4, 2, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -2911,7 +2911,7 @@ Gfx d_course_wario_stadium_packed_dl_4808[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04006D70, 5, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP1Triangle(0, 3, 4, 0),
     gsSPEndDisplayList(),
 };
@@ -2928,31 +2928,31 @@ Gfx d_course_wario_stadium_packed_dl_4930[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04006DC0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 0, 0),
-    gsSP1Quadrangle(6, 7, 8, 0, 0),
-    gsSP1Quadrangle(0, 8, 9, 1, 0),
-    gsSP1Quadrangle(10, 4, 0, 3, 0),
-    gsSP1Quadrangle(11, 12, 5, 4, 0),
-    gsSP1Quadrangle(13, 11, 4, 14, 0),
-    gsSP1Quadrangle(15, 16, 17, 18, 0),
-    gsSP1Quadrangle(15, 19, 20, 16, 0),
-    gsSP1Quadrangle(15, 18, 21, 22, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 0, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 0, 0),
+    gsSP2Triangles(0, 8, 9, 0, 0, 9, 1, 0),
+    gsSP2Triangles(10, 4, 0, 0, 10, 0, 3, 0),
+    gsSP2Triangles(11, 12, 5, 0, 11, 5, 4, 0),
+    gsSP2Triangles(13, 11, 4, 0, 13, 4, 14, 0),
+    gsSP2Triangles(15, 16, 17, 0, 15, 17, 18, 0),
+    gsSP2Triangles(15, 19, 20, 0, 15, 20, 16, 0),
+    gsSP2Triangles(15, 18, 21, 0, 15, 21, 22, 0),
     gsSP2Triangles(16, 23, 17, 0, 23, 24, 25, 0),
     gsSP2Triangles(23, 25, 22, 0, 26, 27, 28, 0),
-    gsSP1Quadrangle(26, 28, 29, 30, 0),
+    gsSP2Triangles(26, 28, 29, 0, 26, 29, 30, 0),
     gsSP1Triangle(26, 30, 31, 0),
     gsSPVertex(0x04006FC0, 28, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(4, 8, 9, 5, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(10, 14, 15, 11, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(16, 19, 20, 21, 0),
-    gsSP1Quadrangle(20, 22, 23, 21, 0),
-    gsSP1Quadrangle(12, 24, 25, 13, 0),
-    gsSP1Quadrangle(6, 26, 27, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(4, 8, 9, 0, 4, 9, 5, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(10, 14, 15, 0, 10, 15, 11, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(16, 19, 20, 0, 16, 20, 21, 0),
+    gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0),
+    gsSP2Triangles(12, 24, 25, 0, 12, 25, 13, 0),
+    gsSP2Triangles(6, 26, 27, 0, 6, 27, 7, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -2962,7 +2962,7 @@ Gfx d_course_wario_stadium_packed_dl_4930[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04007180, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2978,28 +2978,28 @@ Gfx d_course_wario_stadium_packed_dl_4AA0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040071C0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 0, 3, 5, 0),
-    gsSP1Quadrangle(6, 7, 4, 5, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 8, 11, 13, 0),
-    gsSP1Quadrangle(10, 14, 15, 11, 0),
-    gsSP1Quadrangle(11, 15, 16, 13, 0),
-    gsSP1Quadrangle(14, 17, 18, 15, 0),
-    gsSP1Quadrangle(15, 18, 19, 16, 0),
-    gsSP1Quadrangle(9, 20, 21, 10, 0),
-    gsSP1Quadrangle(21, 22, 14, 10, 0),
-    gsSP1Quadrangle(22, 23, 17, 14, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 24, 27, 29, 0),
-    gsSP1Quadrangle(26, 30, 31, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 0, 3, 0, 4, 3, 5, 0),
+    gsSP2Triangles(6, 7, 4, 0, 6, 4, 5, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 8, 11, 0, 12, 11, 13, 0),
+    gsSP2Triangles(10, 14, 15, 0, 10, 15, 11, 0),
+    gsSP2Triangles(11, 15, 16, 0, 11, 16, 13, 0),
+    gsSP2Triangles(14, 17, 18, 0, 14, 18, 15, 0),
+    gsSP2Triangles(15, 18, 19, 0, 15, 19, 16, 0),
+    gsSP2Triangles(9, 20, 21, 0, 9, 21, 10, 0),
+    gsSP2Triangles(21, 22, 14, 0, 21, 14, 10, 0),
+    gsSP2Triangles(22, 23, 17, 0, 22, 17, 14, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 24, 27, 0, 28, 27, 29, 0),
+    gsSP2Triangles(26, 30, 31, 0, 26, 31, 27, 0),
     gsSPVertex(0x040073C0, 13, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 0, 3, 5, 0),
-    gsSP1Quadrangle(3, 2, 6, 7, 0),
-    gsSP1Quadrangle(5, 3, 7, 8, 0),
-    gsSP1Quadrangle(9, 10, 5, 8, 0),
-    gsSP1Quadrangle(11, 12, 1, 0, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 0, 3, 0, 4, 3, 5, 0),
+    gsSP2Triangles(3, 2, 6, 0, 3, 6, 7, 0),
+    gsSP2Triangles(5, 3, 7, 0, 5, 7, 8, 0),
+    gsSP2Triangles(9, 10, 5, 0, 9, 5, 8, 0),
+    gsSP2Triangles(11, 12, 1, 0, 11, 1, 0, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3015,20 +3015,20 @@ Gfx d_course_wario_stadium_packed_dl_4BA8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04007490, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
-    gsSP1Quadrangle(2, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 2, 7, 9, 0),
-    gsSP1Quadrangle(2, 8, 10, 3, 0),
-    gsSP1Quadrangle(11, 12, 13, 14, 0),
-    gsSP1Quadrangle(15, 16, 11, 14, 0),
-    gsSP1Quadrangle(12, 17, 18, 13, 0),
-    gsSP1Quadrangle(19, 20, 8, 9, 0),
-    gsSP1Quadrangle(21, 22, 23, 24, 0),
-    gsSP1Quadrangle(23, 25, 26, 24, 0),
-    gsSP1Quadrangle(27, 28, 29, 30, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
+    gsSP2Triangles(2, 5, 6, 0, 2, 6, 7, 0),
+    gsSP2Triangles(8, 2, 7, 0, 8, 7, 9, 0),
+    gsSP2Triangles(2, 8, 10, 0, 2, 10, 3, 0),
+    gsSP2Triangles(11, 12, 13, 0, 11, 13, 14, 0),
+    gsSP2Triangles(15, 16, 11, 0, 15, 11, 14, 0),
+    gsSP2Triangles(12, 17, 18, 0, 12, 18, 13, 0),
+    gsSP2Triangles(19, 20, 8, 0, 19, 8, 9, 0),
+    gsSP2Triangles(21, 22, 23, 0, 21, 23, 24, 0),
+    gsSP2Triangles(23, 25, 26, 0, 23, 26, 24, 0),
+    gsSP2Triangles(27, 28, 29, 0, 27, 29, 30, 0),
     gsSPVertex(0x04007680, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(0, 3, 4, 0, 5, 4, 6, 0),
     gsSP2Triangles(5, 6, 7, 0, 4, 3, 8, 0),
     gsSP2Triangles(4, 8, 6, 0, 9, 10, 11, 0),
@@ -3059,7 +3059,7 @@ Gfx d_course_wario_stadium_packed_dl_4BA8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040079D0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3075,26 +3075,26 @@ Gfx d_course_wario_stadium_packed_dl_4D68[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04007A10, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 8, 11, 13, 0),
-    gsSP1Quadrangle(13, 11, 14, 15, 0),
-    gsSP1Quadrangle(11, 10, 16, 14, 0),
-    gsSP1Quadrangle(10, 17, 18, 16, 0),
-    gsSP1Quadrangle(9, 19, 17, 10, 0),
-    gsSP1Quadrangle(14, 16, 20, 21, 0),
-    gsSP1Quadrangle(16, 18, 22, 20, 0),
-    gsSP1Quadrangle(15, 14, 21, 23, 0),
-    gsSP1Quadrangle(24, 25, 5, 4, 0),
-    gsSP1Quadrangle(5, 26, 27, 6, 0),
-    gsSP1Quadrangle(5, 0, 28, 26, 0),
-    gsSP1Quadrangle(25, 29, 0, 5, 0),
-    gsSP1Quadrangle(29, 30, 1, 0, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 8, 11, 0, 12, 11, 13, 0),
+    gsSP2Triangles(13, 11, 14, 0, 13, 14, 15, 0),
+    gsSP2Triangles(11, 10, 16, 0, 11, 16, 14, 0),
+    gsSP2Triangles(10, 17, 18, 0, 10, 18, 16, 0),
+    gsSP2Triangles(9, 19, 17, 0, 9, 17, 10, 0),
+    gsSP2Triangles(14, 16, 20, 0, 14, 20, 21, 0),
+    gsSP2Triangles(16, 18, 22, 0, 16, 22, 20, 0),
+    gsSP2Triangles(15, 14, 21, 0, 15, 21, 23, 0),
+    gsSP2Triangles(24, 25, 5, 0, 24, 5, 4, 0),
+    gsSP2Triangles(5, 26, 27, 0, 5, 27, 6, 0),
+    gsSP2Triangles(5, 0, 28, 0, 5, 28, 26, 0),
+    gsSP2Triangles(25, 29, 0, 0, 25, 0, 5, 0),
+    gsSP2Triangles(29, 30, 1, 0, 29, 1, 0, 0),
     gsSPVertex(0x04007C00, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
-    gsSP1Quadrangle(4, 6, 7, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
+    gsSP2Triangles(4, 6, 7, 0, 4, 7, 5, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -3104,7 +3104,7 @@ Gfx d_course_wario_stadium_packed_dl_4D68[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04007C80, 5, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP1Triangle(1, 4, 2, 0),
     gsSPEndDisplayList(),
 };
@@ -3121,16 +3121,16 @@ Gfx d_course_wario_stadium_packed_dl_4EB8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04007CD0, 23, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 0, 3, 5, 0),
-    gsSP1Quadrangle(6, 4, 5, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(9, 12, 13, 10, 0),
-    gsSP1Quadrangle(14, 15, 10, 13, 0),
-    gsSP1Quadrangle(15, 16, 17, 18, 0),
-    gsSP1Quadrangle(19, 20, 16, 15, 0),
-    gsSP1Quadrangle(10, 15, 18, 21, 0),
-    gsSP1Quadrangle(11, 10, 21, 22, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 0, 3, 0, 4, 3, 5, 0),
+    gsSP2Triangles(6, 4, 5, 0, 6, 5, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(9, 12, 13, 0, 9, 13, 10, 0),
+    gsSP2Triangles(14, 15, 10, 0, 14, 10, 13, 0),
+    gsSP2Triangles(15, 16, 17, 0, 15, 17, 18, 0),
+    gsSP2Triangles(19, 20, 16, 0, 19, 16, 15, 0),
+    gsSP2Triangles(10, 15, 18, 0, 10, 18, 21, 0),
+    gsSP2Triangles(11, 10, 21, 0, 11, 21, 22, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -3140,7 +3140,7 @@ Gfx d_course_wario_stadium_packed_dl_4EB8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04007E40, 5, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP1Triangle(0, 3, 4, 0),
     gsSPEndDisplayList(),
 };
@@ -3157,14 +3157,14 @@ Gfx d_course_wario_stadium_packed_dl_4FB8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04007E90, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(4, 7, 8, 9, 0),
-    gsSP1Quadrangle(2, 10, 8, 7, 0),
-    gsSP1Quadrangle(11, 12, 5, 4, 0),
-    gsSP1Quadrangle(13, 1, 4, 9, 0),
-    gsSP1Quadrangle(1, 14, 11, 4, 0),
-    gsSP1Quadrangle(15, 14, 1, 0, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(4, 7, 8, 0, 4, 8, 9, 0),
+    gsSP2Triangles(2, 10, 8, 0, 2, 8, 7, 0),
+    gsSP2Triangles(11, 12, 5, 0, 11, 5, 4, 0),
+    gsSP2Triangles(13, 1, 4, 0, 13, 4, 9, 0),
+    gsSP2Triangles(1, 14, 11, 0, 1, 11, 4, 0),
+    gsSP2Triangles(15, 14, 1, 0, 15, 1, 0, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -3174,7 +3174,7 @@ Gfx d_course_wario_stadium_packed_dl_4FB8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04007F90, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3190,24 +3190,24 @@ Gfx d_course_wario_stadium_packed_dl_50A0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04007FD0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(4, 6, 7, 5, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 8, 11, 0),
-    gsSP1Quadrangle(9, 14, 15, 10, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(18, 20, 21, 19, 0),
-    gsSP1Quadrangle(20, 22, 23, 21, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(25, 28, 29, 26, 0),
-    gsSP1Quadrangle(28, 30, 31, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(4, 6, 7, 0, 4, 7, 5, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 8, 0, 12, 8, 11, 0),
+    gsSP2Triangles(9, 14, 15, 0, 9, 15, 10, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(18, 20, 21, 0, 18, 21, 19, 0),
+    gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(25, 28, 29, 0, 25, 29, 26, 0),
+    gsSP2Triangles(28, 30, 31, 0, 28, 31, 29, 0),
     gsSPVertex(0x040081D0, 27, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
-    gsSP1Quadrangle(4, 6, 7, 5, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(10, 12, 13, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
+    gsSP2Triangles(4, 6, 7, 0, 4, 7, 5, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(10, 12, 13, 0, 10, 13, 11, 0),
     gsSP2Triangles(10, 14, 12, 0, 15, 16, 11, 0),
     gsSP2Triangles(15, 11, 13, 0, 14, 17, 18, 0),
     gsSP2Triangles(14, 18, 16, 0, 19, 20, 21, 0),
@@ -3223,7 +3223,7 @@ Gfx d_course_wario_stadium_packed_dl_50A0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04008380, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3239,8 +3239,8 @@ Gfx d_course_wario_stadium_packed_dl_5208[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040083C0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 6, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x007C),
@@ -3250,8 +3250,8 @@ Gfx d_course_wario_stadium_packed_dl_5208[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04008440, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
     gsSP2Triangles(2, 6, 4, 0, 7, 8, 3, 0),
     gsSP2Triangles(7, 3, 5, 0, 6, 9, 10, 0),
     gsSP2Triangles(6, 10, 8, 0, 11, 12, 13, 0),
@@ -3273,8 +3273,8 @@ Gfx d_course_wario_stadium_packed_dl_52F8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04008580, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 6, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x007C),
@@ -3284,10 +3284,10 @@ Gfx d_course_wario_stadium_packed_dl_52F8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04008600, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(2, 6, 7, 4, 0),
-    gsSP1Quadrangle(6, 8, 9, 10, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(2, 6, 7, 0, 2, 7, 4, 0),
+    gsSP2Triangles(6, 8, 9, 0, 6, 9, 10, 0),
     gsSP1Triangle(11, 9, 8, 0),
     gsSPEndDisplayList(),
 };
@@ -3304,24 +3304,24 @@ Gfx d_course_wario_stadium_packed_dl_53D0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040086C0, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 0, 3, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 6, 9, 11, 0),
-    gsSP1Quadrangle(12, 13, 4, 5, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(16, 18, 19, 20, 0),
-    gsSP1Quadrangle(16, 20, 21, 17, 0),
-    gsSP1Quadrangle(18, 22, 23, 24, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 0, 3, 0, 4, 3, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 6, 9, 0, 10, 9, 11, 0),
+    gsSP2Triangles(12, 13, 4, 0, 12, 4, 5, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(16, 18, 19, 0, 16, 19, 20, 0),
+    gsSP2Triangles(16, 20, 21, 0, 16, 21, 17, 0),
+    gsSP2Triangles(18, 22, 23, 0, 18, 23, 24, 0),
     gsSP2Triangles(24, 17, 21, 0, 25, 26, 10, 0),
     gsSP2Triangles(25, 10, 11, 0, 27, 28, 29, 0),
     gsSP1Triangle(27, 29, 30, 0),
     gsSPVertex(0x040088B0, 14, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(4, 7, 8, 9, 0),
-    gsSP1Quadrangle(1, 10, 11, 2, 0),
-    gsSP1Quadrangle(8, 12, 13, 9, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(4, 7, 8, 0, 4, 8, 9, 0),
+    gsSP2Triangles(1, 10, 11, 0, 1, 11, 2, 0),
+    gsSP2Triangles(8, 12, 13, 0, 8, 13, 9, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -3331,7 +3331,7 @@ Gfx d_course_wario_stadium_packed_dl_53D0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04008990, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3347,12 +3347,12 @@ Gfx d_course_wario_stadium_packed_dl_5508[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040089D0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(6, 5, 0, 3, 0),
-    gsSP1Quadrangle(3, 2, 8, 9, 0),
-    gsSP1Quadrangle(7, 6, 10, 11, 0),
-    gsSP1Quadrangle(10, 6, 3, 9, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(6, 5, 0, 0, 6, 0, 3, 0),
+    gsSP2Triangles(3, 2, 8, 0, 3, 8, 9, 0),
+    gsSP2Triangles(7, 6, 10, 0, 7, 10, 11, 0),
+    gsSP2Triangles(10, 6, 3, 0, 10, 3, 9, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3368,12 +3368,12 @@ Gfx d_course_wario_stadium_packed_dl_5590[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04008A90, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 1, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 6, 9, 0),
-    gsSP1Quadrangle(12, 11, 10, 13, 0),
-    gsSP1Quadrangle(4, 14, 15, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 1, 4, 0, 2, 4, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 6, 0, 10, 6, 9, 0),
+    gsSP2Triangles(12, 11, 10, 0, 12, 10, 13, 0),
+    gsSP2Triangles(4, 14, 15, 0, 4, 15, 5, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -3383,7 +3383,7 @@ Gfx d_course_wario_stadium_packed_dl_5590[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04008B90, 5, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP1Triangle(1, 4, 2, 0),
     gsSPEndDisplayList(),
 };
@@ -3418,11 +3418,11 @@ Gfx d_course_wario_stadium_packed_dl_56E0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04008BE0, 13, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(4, 6, 7, 5, 0),
-    gsSP1Quadrangle(6, 8, 9, 7, 0),
-    gsSP1Quadrangle(8, 10, 11, 9, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(4, 6, 7, 0, 4, 7, 5, 0),
+    gsSP2Triangles(6, 8, 9, 0, 6, 9, 7, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0),
     gsSP1Triangle(11, 12, 9, 0),
     gsSPEndDisplayList(),
 };
@@ -3439,13 +3439,13 @@ Gfx d_course_wario_stadium_packed_dl_5768[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04008CB0, 26, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3461,13 +3461,13 @@ Gfx d_course_wario_stadium_packed_dl_57F8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04008E50, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
-    gsSP1Quadrangle(6, 0, 3, 7, 0),
-    gsSP1Quadrangle(8, 6, 7, 9, 0),
-    gsSP1Quadrangle(10, 8, 9, 11, 0),
-    gsSP1Quadrangle(12, 10, 11, 13, 0),
-    gsSP1Quadrangle(14, 12, 13, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
+    gsSP2Triangles(6, 0, 3, 0, 6, 3, 7, 0),
+    gsSP2Triangles(8, 6, 7, 0, 8, 7, 9, 0),
+    gsSP2Triangles(10, 8, 9, 0, 10, 9, 11, 0),
+    gsSP2Triangles(12, 10, 11, 0, 12, 11, 13, 0),
+    gsSP2Triangles(14, 12, 13, 0, 14, 13, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3483,17 +3483,17 @@ Gfx d_course_wario_stadium_packed_dl_5888[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04008F50, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 4, 7, 9, 0),
-    gsSP1Quadrangle(10, 8, 9, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(18, 20, 21, 19, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 4, 7, 0, 8, 7, 9, 0),
+    gsSP2Triangles(10, 8, 9, 0, 10, 9, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(18, 20, 21, 0, 18, 21, 19, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPVertex(0x04009130, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3509,12 +3509,12 @@ Gfx d_course_wario_stadium_packed_dl_5938[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04009170, 14, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
-    gsSP1Quadrangle(6, 0, 3, 7, 0),
-    gsSP1Quadrangle(8, 6, 7, 9, 0),
-    gsSP1Quadrangle(10, 8, 9, 11, 0),
-    gsSP1Quadrangle(12, 10, 11, 13, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
+    gsSP2Triangles(6, 0, 3, 0, 6, 3, 7, 0),
+    gsSP2Triangles(8, 6, 7, 0, 8, 7, 9, 0),
+    gsSP2Triangles(10, 8, 9, 0, 10, 9, 11, 0),
+    gsSP2Triangles(12, 10, 11, 0, 12, 11, 13, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3530,9 +3530,9 @@ Gfx d_course_wario_stadium_packed_dl_59C0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04009250, 9, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
-    gsSP1Quadrangle(4, 6, 7, 8, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
+    gsSP2Triangles(4, 6, 7, 0, 4, 7, 8, 0),
     gsSP1Triangle(4, 8, 5, 0),
     gsSPEndDisplayList(),
 };
@@ -3549,8 +3549,8 @@ Gfx d_course_wario_stadium_packed_dl_5A38[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x040092E0, 7, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
     gsSP1Triangle(2, 6, 3, 0),
     gsSPEndDisplayList(),
 };
@@ -3567,13 +3567,13 @@ Gfx d_course_wario_stadium_packed_dl_5AA8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04009350, 28, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3590,7 +3590,7 @@ Gfx d_course_wario_stadium_packed_dl_5B38[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04009510, 13, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
-    gsSP1Quadrangle(4, 5, 2, 6, 0),
+    gsSP2Triangles(4, 5, 2, 0, 4, 2, 6, 0),
     gsSP2Triangles(5, 0, 2, 0, 7, 8, 9, 0),
     gsSP2Triangles(7, 9, 10, 0, 11, 4, 6, 0),
     gsSP1Triangle(11, 6, 12, 0),
@@ -3609,8 +3609,8 @@ Gfx d_course_wario_stadium_packed_dl_5BB8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x040095E0, 9, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
     gsSP2Triangles(5, 6, 3, 0, 4, 7, 8, 0),
     gsSP1Triangle(4, 8, 5, 0),
     gsSPEndDisplayList(),
@@ -3628,11 +3628,11 @@ Gfx d_course_wario_stadium_packed_dl_5C30[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04009670, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -3648,8 +3648,8 @@ Gfx d_course_wario_stadium_packed_dl_5CB0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x040097B0, 7, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
     gsSP1Triangle(5, 6, 2, 0),
     gsSPEndDisplayList(),
 };
@@ -3666,8 +3666,8 @@ Gfx d_course_wario_stadium_packed_dl_5D20[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(0x04009820, 7, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
     gsSP1Triangle(5, 6, 2, 0),
     gsSPEndDisplayList(),
 };
@@ -3704,7 +3704,7 @@ Gfx d_course_wario_stadium_packed_dl_5E00[] =
     gsSPVertex(0x04009890, 25, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(3, 5, 6, 0, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
     gsSP2Triangles(14, 15, 16, 0, 17, 18, 19, 0),
     gsSP2Triangles(17, 20, 18, 0, 11, 21, 12, 0),
     gsSP1Triangle(22, 23, 24, 0),
@@ -3723,7 +3723,7 @@ Gfx d_course_wario_stadium_packed_dl_5E88[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04009A20, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(0, 3, 4, 0, 5, 6, 7, 0),
     gsSP2Triangles(5, 8, 6, 0, 9, 10, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 15, 16, 17, 0),
@@ -3749,9 +3749,9 @@ Gfx d_course_wario_stadium_packed_dl_5F08[] =
     gsSP2Triangles(12, 13, 14, 0, 15, 16, 17, 0),
     gsSP2Triangles(18, 19, 20, 0, 21, 22, 23, 0),
     gsSP2Triangles(21, 24, 22, 0, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04009DA0, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(10, 11, 12, 0, 13, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 16, 19, 17, 0),
@@ -3795,9 +3795,9 @@ Gfx d_course_wario_stadium_packed_dl_6068[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400A1A0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 4, 0),
-    gsSP1Quadrangle(9, 10, 11, 12, 0),
+    gsSP2Triangles(9, 10, 11, 0, 9, 11, 12, 0),
     gsSP2Triangles(13, 14, 15, 0, 13, 16, 14, 0),
     gsSP2Triangles(17, 18, 19, 0, 20, 21, 17, 0),
     gsSP2Triangles(20, 17, 22, 0, 23, 24, 25, 0),
@@ -3819,7 +3819,7 @@ Gfx d_course_wario_stadium_packed_dl_6108[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400A3D0, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(3, 4, 5, 0, 6, 7, 8, 0),
     gsSP2Triangles(6, 9, 7, 0, 10, 11, 12, 0),
     gsSP2Triangles(13, 14, 15, 0, 16, 17, 18, 0),
@@ -3842,7 +3842,7 @@ Gfx d_course_wario_stadium_packed_dl_6198[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400A5C0, 31, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsSP2Triangles(10, 11, 12, 0, 13, 14, 15, 0),
     gsSP2Triangles(16, 17, 15, 0, 10, 18, 19, 0),
     gsSP2Triangles(10, 20, 18, 0, 21, 22, 23, 0),
@@ -3851,7 +3851,7 @@ Gfx d_course_wario_stadium_packed_dl_6198[] =
     gsSPVertex(0x0400A7B0, 30, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(6, 7, 8, 0, 6, 9, 7, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
     gsSP2Triangles(14, 15, 16, 0, 17, 14, 18, 0),
     gsSP2Triangles(4, 19, 20, 0, 21, 22, 23, 0),
     gsSP2Triangles(24, 25, 26, 0, 27, 28, 29, 0),
@@ -3864,7 +3864,7 @@ Gfx d_course_wario_stadium_packed_dl_6198[] =
     gsSP2Triangles(21, 23, 24, 0, 25, 26, 27, 0),
     gsSP2Triangles(26, 28, 27, 0, 29, 30, 31, 0),
     gsSPVertex(0x0400AB90, 17, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(8, 10, 9, 0, 11, 12, 13, 0),
     gsSP1Triangle(14, 15, 16, 0),
@@ -3885,11 +3885,11 @@ Gfx d_course_wario_stadium_packed_dl_62C8[] =
     gsSPVertex(0x0400ACA0, 31, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
     gsSP2Triangles(4, 5, 6, 0, 4, 7, 5, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSP2Triangles(12, 13, 14, 0, 13, 15, 14, 0),
     gsSP2Triangles(16, 17, 18, 0, 17, 19, 18, 0),
     gsSP2Triangles(20, 21, 22, 0, 21, 23, 22, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSP1Triangle(28, 29, 30, 0),
     gsSPVertex(0x0400AE90, 19, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
@@ -3991,11 +3991,11 @@ Gfx d_course_wario_stadium_packed_dl_65A0[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400B830, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsSP2Triangles(10, 11, 12, 0, 11, 13, 12, 0),
     gsSP2Triangles(14, 15, 16, 0, 17, 18, 19, 0),
     gsSP2Triangles(17, 20, 21, 0, 22, 23, 24, 0),
-    gsSP1Quadrangle(25, 26, 27, 28, 0),
+    gsSP2Triangles(25, 26, 27, 0, 25, 27, 28, 0),
     gsSP1Triangle(29, 30, 31, 0),
     gsSPVertex(0x0400BA30, 18, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
@@ -4165,7 +4165,7 @@ Gfx d_course_wario_stadium_packed_dl_6A10[] =
     gsSP2Triangles(10, 11, 12, 0, 13, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 19, 20, 21, 0),
     gsSP2Triangles(4, 22, 23, 0, 24, 25, 26, 0),
-    gsSP1Quadrangle(27, 28, 29, 30, 0),
+    gsSP2Triangles(27, 28, 29, 0, 27, 29, 30, 0),
     gsSPVertex(0x0400CB80, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(6, 7, 8, 0, 9, 10, 11, 0),
@@ -4199,7 +4199,7 @@ Gfx d_course_wario_stadium_packed_dl_6AE8[] =
     gsSP2Triangles(24, 0, 25, 0, 26, 27, 28, 0),
     gsSP1Triangle(29, 30, 31, 0),
     gsSPVertex(0x0400D010, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 5, 7, 6, 0),
     gsSP2Triangles(8, 9, 10, 0, 11, 12, 13, 0),
     gsSP2Triangles(11, 14, 12, 0, 15, 16, 17, 0),
@@ -4234,7 +4234,7 @@ Gfx d_course_wario_stadium_packed_dl_6BE0[] =
     gsSP2Triangles(21, 23, 24, 0, 25, 26, 27, 0),
     gsSP2Triangles(25, 28, 26, 0, 29, 30, 31, 0),
     gsSPVertex(0x0400D550, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4252,13 +4252,13 @@ Gfx d_course_wario_stadium_packed_dl_6C80[] =
     gsSPVertex(0x0400D590, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(3, 6, 4, 0, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
     gsSP2Triangles(14, 15, 16, 0, 17, 18, 19, 0),
     gsSP2Triangles(17, 20, 18, 0, 21, 22, 23, 0),
     gsSP2Triangles(21, 23, 24, 0, 25, 26, 27, 0),
     gsSP2Triangles(25, 28, 26, 0, 29, 30, 31, 0),
     gsSPVertex(0x0400D790, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4301,25 +4301,25 @@ Gfx d_course_wario_stadium_packed_dl_6DD8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400D7D0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05003800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400D890, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(11, 10, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(11, 10, 12, 0, 11, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPVertex(0x0400DA70, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4335,26 +4335,26 @@ Gfx d_course_wario_stadium_packed_dl_6EC8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400DAB0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05003800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400DBB0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 1, 0, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(9, 8, 10, 11, 0),
-    gsSP1Quadrangle(11, 10, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 5, 4, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(9, 8, 10, 0, 9, 10, 11, 0),
+    gsSP2Triangles(11, 10, 12, 0, 11, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 5, 0, 26, 5, 4, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4370,21 +4370,21 @@ Gfx d_course_wario_stadium_packed_dl_6FC0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400DDB0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
-    gsSP1Quadrangle(29, 28, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
+    gsSP2Triangles(29, 28, 30, 0, 29, 30, 31, 0),
     gsSPVertex(0x0400DFB0, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4405,7 +4405,7 @@ Gfx d_course_wario_stadium_packed_dl_7090[] =
     gsSP2Triangles(4, 6, 5, 0, 7, 8, 9, 0),
     gsSP2Triangles(7, 9, 10, 0, 9, 11, 12, 0),
     gsSP2Triangles(9, 12, 10, 0, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 13, 15, 17, 0),
+    gsSP2Triangles(16, 13, 15, 0, 16, 15, 17, 0),
     gsSP2Triangles(18, 19, 20, 0, 21, 18, 20, 0),
     gsSP2Triangles(22, 21, 20, 0, 21, 22, 23, 0),
     gsSP2Triangles(24, 21, 23, 0, 25, 26, 27, 0),
@@ -4421,21 +4421,21 @@ Gfx d_course_wario_stadium_packed_dl_7090[] =
     gsSP2Triangles(19, 20, 16, 0, 18, 21, 22, 0),
     gsSP2Triangles(21, 18, 17, 0, 23, 18, 22, 0),
     gsSP2Triangles(24, 23, 22, 0, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 25, 27, 29, 0),
+    gsSP2Triangles(28, 25, 27, 0, 28, 27, 29, 0),
     gsSP1Triangle(8, 7, 30, 0),
     gsSPVertex(0x0400E4D0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 6, 9, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 6, 9, 0, 10, 9, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 16, 19, 17, 0),
     gsSP2Triangles(19, 20, 17, 0, 21, 22, 23, 0),
     gsSP2Triangles(21, 23, 24, 0, 23, 25, 26, 0),
     gsSP2Triangles(23, 26, 24, 0, 27, 28, 29, 0),
     gsSP2Triangles(30, 27, 29, 0, 31, 30, 29, 0),
     gsSPVertex(0x0400E6D0, 15, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(10, 11, 12, 0, 11, 13, 12, 0),
     gsSP1Triangle(13, 14, 12, 0),
@@ -4454,30 +4454,30 @@ Gfx d_course_wario_stadium_packed_dl_7220[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400E7C0, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05003800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400E940, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(23, 22, 5, 4, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(23, 22, 5, 0, 23, 5, 4, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0400EB40, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4493,18 +4493,18 @@ Gfx d_course_wario_stadium_packed_dl_7338[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400EBC0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
-    gsSP1Quadrangle(5, 4, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(11, 10, 12, 13, 0),
-    gsSP1Quadrangle(13, 12, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(19, 18, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 17, 16, 0),
-    gsSP1Quadrangle(24, 25, 23, 22, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
-    gsSP1Quadrangle(30, 31, 27, 26, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
+    gsSP2Triangles(5, 4, 6, 0, 5, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(11, 10, 12, 0, 11, 12, 13, 0),
+    gsSP2Triangles(13, 12, 14, 0, 13, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(19, 18, 20, 0, 19, 20, 21, 0),
+    gsSP2Triangles(22, 23, 17, 0, 22, 17, 16, 0),
+    gsSP2Triangles(24, 25, 23, 0, 24, 23, 22, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
+    gsSP2Triangles(30, 31, 27, 0, 30, 27, 26, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4520,35 +4520,35 @@ Gfx d_course_wario_stadium_packed_dl_73F0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400EDC0, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05003800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400EF40, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(7, 6, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 5, 4, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(19, 18, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(7, 6, 8, 0, 7, 8, 9, 0),
+    gsSP2Triangles(10, 11, 5, 0, 10, 5, 4, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(19, 18, 20, 0, 19, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPVertex(0x0400F120, 26, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(11, 10, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(11, 10, 12, 0, 11, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4564,9 +4564,9 @@ Gfx d_course_wario_stadium_packed_dl_7530[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400F2C0, 13, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSP1Triangle(10, 12, 11, 0),
     gsSPEndDisplayList(),
 };
@@ -4583,12 +4583,12 @@ Gfx d_course_wario_stadium_packed_dl_75A8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400F390, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(15, 14, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 13, 12, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(15, 14, 16, 0, 15, 16, 17, 0),
+    gsSP2Triangles(18, 19, 13, 0, 18, 13, 12, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4604,17 +4604,17 @@ Gfx d_course_wario_stadium_packed_dl_7630[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400F4D0, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(15, 14, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(15, 14, 16, 0, 15, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPVertex(0x0400F6B0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4630,20 +4630,20 @@ Gfx d_course_wario_stadium_packed_dl_76E0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400F730, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x0400F930, 18, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(10, 9, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(10, 9, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4659,13 +4659,13 @@ Gfx d_course_wario_stadium_packed_dl_77A8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400FA50, 28, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4681,32 +4681,32 @@ Gfx d_course_wario_stadium_packed_dl_7838[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400FC10, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05003800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x0400FE10, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04010010, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4722,23 +4722,23 @@ Gfx d_course_wario_stadium_packed_dl_7960[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040100D0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05003800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040102D0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4754,23 +4754,23 @@ Gfx d_course_wario_stadium_packed_dl_7A40[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04010390, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05003800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04010450, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(19, 18, 1, 0, 0),
-    gsSP1Quadrangle(7, 6, 20, 21, 0),
-    gsSP1Quadrangle(21, 20, 22, 23, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(19, 18, 1, 0, 19, 1, 0, 0),
+    gsSP2Triangles(7, 6, 20, 0, 7, 20, 21, 0),
+    gsSP2Triangles(21, 20, 22, 0, 21, 22, 23, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4786,11 +4786,11 @@ Gfx d_course_wario_stadium_packed_dl_7B20[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040105D0, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
-    gsSP1Quadrangle(5, 4, 6, 7, 0),
-    gsSP1Quadrangle(7, 6, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
+    gsSP2Triangles(5, 4, 6, 0, 5, 6, 7, 0),
+    gsSP2Triangles(7, 6, 8, 0, 7, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
     gsSP2Triangles(14, 15, 16, 0, 17, 18, 19, 0),
     gsSP2Triangles(17, 19, 20, 0, 21, 22, 23, 0),
     gsSP2Triangles(21, 23, 24, 0, 25, 26, 22, 0),
@@ -4814,20 +4814,20 @@ Gfx d_course_wario_stadium_packed_dl_7BE0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040107F0, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05003800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04010870, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
-    gsSP1Quadrangle(5, 4, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(11, 10, 12, 13, 0),
-    gsSP1Quadrangle(13, 12, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
+    gsSP2Triangles(5, 4, 6, 0, 5, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(11, 10, 12, 0, 11, 12, 13, 0),
+    gsSP2Triangles(13, 12, 14, 0, 13, 14, 15, 0),
     gsSP2Triangles(16, 17, 18, 0, 19, 20, 16, 0),
     gsSP2Triangles(19, 16, 18, 0, 16, 21, 22, 0),
     gsSP2Triangles(16, 22, 17, 0, 23, 24, 25, 0),
@@ -4854,26 +4854,26 @@ Gfx d_course_wario_stadium_packed_dl_7D00[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04010B40, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05003800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04010B80, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04010D80, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4889,21 +4889,21 @@ Gfx d_course_wario_stadium_packed_dl_7DF8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04010E80, 22, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(7, 6, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(7, 6, 8, 0, 7, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05003800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04010FE0, 13, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 5, 4, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 5, 0, 8, 5, 4, 0),
     gsSP1Triangle(10, 11, 12, 0),
     gsSPEndDisplayList(),
 };
@@ -4920,23 +4920,23 @@ Gfx d_course_wario_stadium_packed_dl_7ED0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040110B0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05003800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040110F0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x040112F0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4952,11 +4952,11 @@ Gfx d_course_wario_stadium_packed_dl_7FB0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04011330, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4972,18 +4972,18 @@ Gfx d_course_wario_stadium_packed_dl_8030[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04011470, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 1, 0, 0),
-    gsSP1Quadrangle(6, 7, 5, 4, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 9, 8, 0),
-    gsSP1Quadrangle(11, 10, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(19, 18, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(25, 24, 26, 27, 0),
-    gsSP1Quadrangle(27, 26, 28, 29, 0),
-    gsSP1Quadrangle(30, 31, 17, 16, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0),
+    gsSP2Triangles(6, 7, 5, 0, 6, 5, 4, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 9, 0, 12, 9, 8, 0),
+    gsSP2Triangles(11, 10, 14, 0, 11, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(19, 18, 20, 0, 19, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(25, 24, 26, 0, 25, 26, 27, 0),
+    gsSP2Triangles(27, 26, 28, 0, 27, 28, 29, 0),
+    gsSP2Triangles(30, 31, 17, 0, 30, 17, 16, 0),
     gsSPEndDisplayList(),
 };
 
@@ -4999,7 +4999,7 @@ Gfx d_course_wario_stadium_packed_dl_80E8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04011670, 25, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(3, 2, 4, 0, 2, 5, 4, 0),
     gsSP2Triangles(5, 6, 4, 0, 7, 8, 9, 0),
     gsSP2Triangles(7, 9, 10, 0, 11, 12, 13, 0),
@@ -5013,22 +5013,22 @@ Gfx d_course_wario_stadium_packed_dl_80E8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04011800, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(7, 6, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 1, 0, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(27, 26, 28, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(7, 6, 20, 0, 7, 20, 21, 0),
+    gsSP2Triangles(22, 23, 1, 0, 22, 1, 0, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(27, 26, 28, 0, 27, 28, 29, 0),
     gsSPVertex(0x040119E0, 25, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(2, 4, 3, 0, 4, 5, 3, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsSP2Triangles(8, 10, 9, 0, 10, 11, 9, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(15, 14, 16, 17, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(15, 14, 16, 0, 15, 16, 17, 0),
     gsSP2Triangles(6, 18, 7, 0, 19, 20, 21, 0),
     gsSP1Triangle(22, 23, 24, 0),
     gsSPEndDisplayList(),
@@ -5046,18 +5046,18 @@ Gfx d_course_wario_stadium_packed_dl_8240[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04011B70, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 1, 0, 0),
-    gsSP1Quadrangle(3, 2, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 5, 4, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 11, 10, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(19, 18, 20, 21, 0),
-    gsSP1Quadrangle(21, 20, 22, 23, 0),
-    gsSP1Quadrangle(23, 22, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
-    gsSP1Quadrangle(29, 28, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0),
+    gsSP2Triangles(3, 2, 6, 0, 3, 6, 7, 0),
+    gsSP2Triangles(8, 9, 5, 0, 8, 5, 4, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 11, 0, 14, 11, 10, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(19, 18, 20, 0, 19, 20, 21, 0),
+    gsSP2Triangles(21, 20, 22, 0, 21, 22, 23, 0),
+    gsSP2Triangles(23, 22, 24, 0, 23, 24, 25, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
+    gsSP2Triangles(29, 28, 30, 0, 29, 30, 31, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5073,16 +5073,16 @@ Gfx d_course_wario_stadium_packed_dl_82F8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04011D70, 28, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 9, 8, 0),
-    gsSP1Quadrangle(11, 10, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(19, 18, 20, 21, 0),
-    gsSP1Quadrangle(21, 20, 22, 23, 0),
-    gsSP1Quadrangle(15, 14, 24, 25, 0),
-    gsSP1Quadrangle(26, 27, 17, 16, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 9, 0, 12, 9, 8, 0),
+    gsSP2Triangles(11, 10, 14, 0, 11, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(19, 18, 20, 0, 19, 20, 21, 0),
+    gsSP2Triangles(21, 20, 22, 0, 21, 22, 23, 0),
+    gsSP2Triangles(15, 14, 24, 0, 15, 24, 25, 0),
+    gsSP2Triangles(26, 27, 17, 0, 26, 17, 16, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5098,14 +5098,14 @@ Gfx d_course_wario_stadium_packed_dl_83A0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04011F30, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(11, 10, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(17, 16, 18, 19, 0),
-    gsSP1Quadrangle(7, 6, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 1, 0, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(11, 10, 12, 0, 11, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(17, 16, 18, 0, 17, 18, 19, 0),
+    gsSP2Triangles(7, 6, 20, 0, 7, 20, 21, 0),
+    gsSP2Triangles(22, 23, 1, 0, 22, 1, 0, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5121,22 +5121,22 @@ Gfx d_course_wario_stadium_packed_dl_8438[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040120B0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05003800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04012170, 26, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 2, 4, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5184,12 +5184,12 @@ Gfx d_course_wario_stadium_packed_dl_85F0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04012310, 22, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(5, 8, 9, 6, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(5, 8, 9, 0, 5, 9, 6, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5206,11 +5206,11 @@ Gfx d_course_wario_stadium_packed_dl_8678[] =
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04012470, 24, 0),
     gsSP2Triangles(0, 1, 2, 0, 2, 3, 0, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 4, 7, 9, 0),
-    gsSP1Quadrangle(10, 6, 5, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 4, 7, 0, 8, 7, 9, 0),
+    gsSP2Triangles(10, 6, 5, 0, 10, 5, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSP2Triangles(20, 21, 22, 0, 21, 23, 22, 0),
     gsSPEndDisplayList(),
 };
@@ -5227,13 +5227,13 @@ Gfx d_course_wario_stadium_packed_dl_8708[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040125F0, 26, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(1, 24, 25, 2, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(1, 24, 25, 0, 1, 25, 2, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5249,28 +5249,28 @@ Gfx d_course_wario_stadium_packed_dl_8798[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04012790, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
-    gsSP1Quadrangle(6, 0, 3, 7, 0),
-    gsSP1Quadrangle(8, 6, 7, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(11, 14, 15, 12, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(17, 20, 21, 18, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(23, 26, 27, 24, 0),
-    gsSP1Quadrangle(26, 28, 29, 27, 0),
-    gsSP1Quadrangle(28, 30, 31, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
+    gsSP2Triangles(6, 0, 3, 0, 6, 3, 7, 0),
+    gsSP2Triangles(8, 6, 7, 0, 8, 7, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(11, 14, 15, 0, 11, 15, 12, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(17, 20, 21, 0, 17, 21, 18, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(23, 26, 27, 0, 23, 27, 24, 0),
+    gsSP2Triangles(26, 28, 29, 0, 26, 29, 27, 0),
+    gsSP2Triangles(28, 30, 31, 0, 28, 31, 29, 0),
     gsSPVertex(0x04012990, 26, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
-    gsSP1Quadrangle(4, 6, 7, 5, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 8, 11, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(6, 18, 19, 7, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(21, 24, 25, 22, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
+    gsSP2Triangles(4, 6, 7, 0, 4, 7, 5, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 8, 11, 0, 12, 11, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(6, 18, 19, 0, 6, 19, 7, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(21, 24, 25, 0, 21, 25, 22, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5286,7 +5286,7 @@ Gfx d_course_wario_stadium_packed_dl_88A0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04012B30, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 0, 3, 0, 5, 6, 4, 0),
     gsSP2Triangles(5, 4, 3, 0, 7, 8, 9, 0),
     gsSP2Triangles(7, 10, 8, 0, 11, 7, 9, 0),
@@ -5295,14 +5295,14 @@ Gfx d_course_wario_stadium_packed_dl_88A0[] =
     gsSP2Triangles(14, 16, 17, 0, 15, 18, 19, 0),
     gsSP2Triangles(15, 19, 16, 0, 16, 19, 20, 0),
     gsSP2Triangles(16, 20, 17, 0, 12, 21, 22, 0),
-    gsSP1Quadrangle(23, 11, 12, 22, 0),
-    gsSP1Quadrangle(9, 24, 25, 12, 0),
+    gsSP2Triangles(23, 11, 12, 0, 23, 12, 22, 0),
+    gsSP2Triangles(9, 24, 25, 0, 9, 25, 12, 0),
     gsSP2Triangles(12, 25, 21, 0, 26, 22, 21, 0),
     gsSP2Triangles(25, 26, 21, 0, 27, 28, 29, 0),
     gsSP2Triangles(29, 28, 30, 0, 30, 28, 31, 0),
     gsSPVertex(0x04012D30, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 0, 2, 0),
-    gsSP1Quadrangle(1, 0, 4, 5, 0),
+    gsSP2Triangles(1, 0, 4, 0, 1, 4, 5, 0),
     gsSP2Triangles(6, 2, 1, 0, 1, 5, 7, 0),
     gsSP2Triangles(8, 1, 9, 0, 6, 1, 8, 0),
     gsSP2Triangles(9, 1, 7, 0, 10, 11, 12, 0),
@@ -5313,7 +5313,7 @@ Gfx d_course_wario_stadium_packed_dl_88A0[] =
     gsSP2Triangles(19, 22, 23, 0, 18, 21, 24, 0),
     gsSP2Triangles(18, 24, 22, 0, 25, 26, 27, 0),
     gsSP2Triangles(25, 27, 28, 0, 14, 29, 30, 0),
-    gsSP1Quadrangle(14, 30, 31, 15, 0),
+    gsSP2Triangles(14, 30, 31, 0, 14, 31, 15, 0),
     gsSPVertex(0x04012F30, 31, 0),
     gsSP2Triangles(0, 1, 2, 0, 2, 3, 4, 0),
     gsSP2Triangles(0, 2, 4, 0, 3, 2, 5, 0),
@@ -5322,8 +5322,8 @@ Gfx d_course_wario_stadium_packed_dl_88A0[] =
     gsSP2Triangles(3, 11, 12, 0, 10, 3, 12, 0),
     gsSP2Triangles(13, 12, 11, 0, 14, 15, 16, 0),
     gsSP2Triangles(17, 14, 18, 0, 18, 14, 19, 0),
-    gsSP1Quadrangle(14, 17, 20, 21, 0),
-    gsSP1Quadrangle(15, 14, 21, 22, 0),
+    gsSP2Triangles(14, 17, 20, 0, 14, 20, 21, 0),
+    gsSP2Triangles(15, 14, 21, 0, 15, 21, 22, 0),
     gsSP2Triangles(14, 16, 19, 0, 15, 23, 16, 0),
     gsSP2Triangles(16, 23, 19, 0, 24, 18, 19, 0),
     gsSP2Triangles(24, 17, 18, 0, 0, 25, 1, 0),
@@ -5347,9 +5347,9 @@ Gfx d_course_wario_stadium_packed_dl_8A68[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04013120, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
-    gsSP1Quadrangle(1, 0, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
+    gsSP2Triangles(1, 0, 6, 0, 1, 6, 7, 0),
     gsSP2Triangles(1, 7, 8, 0, 4, 1, 8, 0),
     gsSP2Triangles(0, 9, 6, 0, 6, 9, 7, 0),
     gsSP2Triangles(7, 9, 10, 0, 11, 10, 9, 0),
@@ -5362,36 +5362,36 @@ Gfx d_course_wario_stadium_packed_dl_8A68[] =
     gsSP2Triangles(4, 15, 19, 0, 17, 4, 19, 0),
     gsSP2Triangles(19, 15, 20, 0, 21, 20, 15, 0),
     gsSP2Triangles(14, 21, 15, 0, 22, 16, 18, 0),
-    gsSP1Quadrangle(17, 23, 24, 22, 0),
+    gsSP2Triangles(17, 23, 24, 0, 17, 24, 22, 0),
     gsSP2Triangles(17, 22, 18, 0, 25, 23, 17, 0),
     gsSP2Triangles(25, 17, 20, 0, 17, 19, 20, 0),
     gsSP2Triangles(26, 27, 28, 0, 29, 26, 28, 0),
-    gsSP1Quadrangle(26, 29, 30, 31, 0),
+    gsSP2Triangles(26, 29, 30, 0, 26, 30, 31, 0),
     gsSPVertex(0x04013320, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 2, 1, 3, 0),
-    gsSP1Quadrangle(4, 5, 3, 1, 0),
+    gsSP2Triangles(4, 5, 3, 0, 4, 3, 1, 0),
     gsSP2Triangles(6, 7, 8, 0, 7, 9, 8, 0),
     gsSP2Triangles(10, 9, 11, 0, 7, 11, 9, 0),
     gsSP2Triangles(7, 12, 11, 0, 12, 10, 11, 0),
     gsSP2Triangles(1, 13, 14, 0, 4, 1, 14, 0),
     gsSP2Triangles(13, 1, 15, 0, 0, 15, 1, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSP2Triangles(16, 19, 20, 0, 21, 16, 20, 0),
     gsSP2Triangles(16, 22, 23, 0, 16, 21, 22, 0),
     gsSP2Triangles(17, 16, 24, 0, 16, 23, 24, 0),
     gsSP2Triangles(25, 19, 18, 0, 26, 20, 19, 0),
     gsSP2Triangles(26, 21, 20, 0, 17, 25, 18, 0),
-    gsSP1Quadrangle(17, 0, 27, 25, 0),
-    gsSP1Quadrangle(17, 24, 13, 15, 0),
+    gsSP2Triangles(17, 0, 27, 0, 17, 27, 25, 0),
+    gsSP2Triangles(17, 24, 13, 0, 17, 13, 15, 0),
     gsSP2Triangles(0, 17, 15, 0, 27, 28, 25, 0),
     gsSP2Triangles(21, 29, 22, 0, 24, 23, 13, 0),
     gsSP2Triangles(0, 28, 27, 0, 29, 23, 22, 0),
-    gsSP1Quadrangle(30, 4, 14, 13, 0),
+    gsSP2Triangles(30, 4, 14, 0, 30, 14, 13, 0),
     gsSP2Triangles(30, 13, 31, 0, 31, 13, 23, 0),
     gsSPVertex(0x04013520, 10, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 2, 1, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 4, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 4, 0, 8, 4, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5407,24 +5407,24 @@ Gfx d_course_wario_stadium_packed_dl_8C28[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040135C0, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(5, 8, 9, 6, 0),
-    gsSP1Quadrangle(8, 10, 11, 9, 0),
-    gsSP1Quadrangle(12, 4, 7, 13, 0),
-    gsSP1Quadrangle(13, 14, 15, 12, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(17, 11, 10, 18, 0),
-    gsSP1Quadrangle(20, 16, 19, 21, 0),
-    gsSP1Quadrangle(22, 20, 21, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(25, 28, 29, 26, 0),
-    gsSP1Quadrangle(14, 24, 27, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(5, 8, 9, 0, 5, 9, 6, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0),
+    gsSP2Triangles(12, 4, 7, 0, 12, 7, 13, 0),
+    gsSP2Triangles(13, 14, 15, 0, 13, 15, 12, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(17, 11, 10, 0, 17, 10, 18, 0),
+    gsSP2Triangles(20, 16, 19, 0, 20, 19, 21, 0),
+    gsSP2Triangles(22, 20, 21, 0, 22, 21, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(25, 28, 29, 0, 25, 29, 26, 0),
+    gsSP2Triangles(14, 24, 27, 0, 14, 27, 15, 0),
     gsSPVertex(0x040137A0, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
     gsSP2Triangles(3, 5, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(10, 11, 12, 0, 10, 13, 11, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
     gsSP2Triangles(18, 19, 20, 0, 19, 21, 20, 0),
     gsSP2Triangles(22, 23, 24, 0, 25, 26, 27, 0),
     gsSP2Triangles(26, 28, 27, 0, 29, 30, 31, 0),
@@ -5443,9 +5443,9 @@ Gfx d_course_wario_stadium_packed_dl_8D28[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040139A0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
@@ -5455,7 +5455,7 @@ Gfx d_course_wario_stadium_packed_dl_8D28[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04013A60, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5471,28 +5471,28 @@ Gfx d_course_wario_stadium_packed_dl_8DE8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04013AA0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(5, 8, 9, 6, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(11, 14, 15, 12, 0),
-    gsSP1Quadrangle(14, 16, 17, 15, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(19, 22, 23, 20, 0),
-    gsSP1Quadrangle(22, 24, 25, 23, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
-    gsSP1Quadrangle(8, 26, 29, 9, 0),
-    gsSP1Quadrangle(27, 30, 31, 28, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(5, 8, 9, 0, 5, 9, 6, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(11, 14, 15, 0, 11, 15, 12, 0),
+    gsSP2Triangles(14, 16, 17, 0, 14, 17, 15, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(19, 22, 23, 0, 19, 23, 20, 0),
+    gsSP2Triangles(22, 24, 25, 0, 22, 25, 23, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
+    gsSP2Triangles(8, 26, 29, 0, 8, 29, 9, 0),
+    gsSP2Triangles(27, 30, 31, 0, 27, 31, 28, 0),
     gsSPVertex(0x04013CA0, 26, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(7, 10, 11, 8, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 12, 15, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 18, 21, 23, 0),
-    gsSP1Quadrangle(24, 22, 23, 25, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(7, 10, 11, 0, 7, 11, 8, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 12, 15, 0, 16, 15, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 18, 21, 0, 22, 21, 23, 0),
+    gsSP2Triangles(24, 22, 23, 0, 24, 23, 25, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5508,22 +5508,22 @@ Gfx d_course_wario_stadium_packed_dl_8EF0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04013E40, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04014040, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 0, 3, 5, 0),
-    gsSP1Quadrangle(1, 6, 7, 2, 0),
-    gsSP1Quadrangle(8, 4, 5, 9, 0),
-    gsSP1Quadrangle(6, 10, 11, 7, 0),
-    gsSP1Quadrangle(10, 12, 13, 11, 0),
-    gsSP1Quadrangle(12, 14, 15, 13, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 0, 3, 0, 4, 3, 5, 0),
+    gsSP2Triangles(1, 6, 7, 0, 1, 7, 2, 0),
+    gsSP2Triangles(8, 4, 5, 0, 8, 5, 9, 0),
+    gsSP2Triangles(6, 10, 11, 0, 6, 11, 7, 0),
+    gsSP2Triangles(10, 12, 13, 0, 10, 13, 11, 0),
+    gsSP2Triangles(12, 14, 15, 0, 12, 15, 13, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5539,20 +5539,20 @@ Gfx d_course_wario_stadium_packed_dl_8FC8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04014140, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(4, 10, 13, 5, 0),
-    gsSP1Quadrangle(11, 14, 15, 12, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(16, 20, 21, 17, 0),
-    gsSP1Quadrangle(20, 22, 23, 21, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(4, 10, 13, 0, 4, 13, 5, 0),
+    gsSP2Triangles(11, 14, 15, 0, 11, 15, 12, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(16, 20, 21, 0, 16, 21, 17, 0),
+    gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04014340, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5568,13 +5568,13 @@ Gfx d_course_wario_stadium_packed_dl_9090[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040143C0, 28, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5592,15 +5592,15 @@ Gfx d_course_wario_stadium_packed_dl_9120[] =
     gsSPVertex(0x04014580, 31, 0),
     gsSP2Triangles(0, 1, 2, 0, 3, 0, 2, 0),
     gsSP2Triangles(4, 5, 6, 0, 4, 7, 5, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(9, 12, 13, 10, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(9, 12, 13, 0, 9, 13, 10, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
     gsSP2Triangles(18, 19, 20, 0, 19, 21, 20, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
     gsSP2Triangles(26, 24, 23, 0, 27, 28, 29, 0),
     gsSP1Triangle(30, 27, 29, 0),
     gsSPVertex(0x04014770, 15, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 5, 7, 6, 0),
     gsSP2Triangles(8, 9, 10, 0, 11, 12, 13, 0),
     gsSP1Triangle(11, 14, 12, 0),
@@ -5641,13 +5641,13 @@ Gfx d_course_wario_stadium_packed_dl_91E8[] =
     gsSP2Triangles(9, 11, 12, 0, 13, 14, 12, 0),
     gsSP2Triangles(13, 12, 11, 0, 15, 16, 17, 0),
     gsSP2Triangles(15, 17, 18, 0, 17, 19, 20, 0),
-    gsSP1Quadrangle(17, 20, 21, 18, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 22, 25, 27, 0),
+    gsSP2Triangles(17, 20, 21, 0, 17, 21, 18, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 22, 25, 0, 26, 25, 27, 0),
     gsSP1Triangle(28, 29, 30, 0),
     gsSPVertex(0x04014C50, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5663,12 +5663,12 @@ Gfx d_course_wario_stadium_packed_dl_9328[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04014CD0, 22, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 7, 8, 9, 0),
     gsSP2Triangles(7, 9, 10, 0, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(1, 18, 19, 2, 0),
-    gsSP1Quadrangle(18, 20, 21, 19, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(1, 18, 19, 0, 1, 19, 2, 0),
+    gsSP2Triangles(18, 20, 21, 0, 18, 21, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5684,11 +5684,11 @@ Gfx d_course_wario_stadium_packed_dl_93B0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04014E30, 14, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
-    gsSP1Quadrangle(4, 6, 7, 5, 0),
-    gsSP1Quadrangle(8, 0, 3, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
+    gsSP2Triangles(4, 6, 7, 0, 4, 7, 5, 0),
+    gsSP2Triangles(8, 0, 3, 0, 8, 3, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5708,30 +5708,30 @@ Gfx d_course_wario_stadium_packed_dl_9430[] =
     gsSP2Triangles(0, 4, 1, 0, 0, 5, 4, 0),
     gsSP2Triangles(2, 1, 6, 0, 7, 1, 4, 0),
     gsSP2Triangles(1, 8, 9, 0, 6, 1, 9, 0),
-    gsSP1Quadrangle(1, 7, 10, 8, 0),
+    gsSP2Triangles(1, 7, 10, 0, 1, 10, 8, 0),
     gsSP2Triangles(3, 2, 6, 0, 11, 12, 3, 0),
-    gsSP1Quadrangle(11, 3, 6, 13, 0),
+    gsSP2Triangles(11, 3, 6, 0, 11, 6, 13, 0),
     gsSP2Triangles(13, 6, 14, 0, 6, 9, 14, 0),
     gsSP2Triangles(5, 7, 4, 0, 15, 11, 13, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 16, 19, 0),
-    gsSP1Quadrangle(17, 22, 23, 18, 0),
-    gsSP1Quadrangle(24, 25, 19, 18, 0),
-    gsSP1Quadrangle(26, 24, 18, 23, 0),
-    gsSP1Quadrangle(25, 27, 20, 19, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 16, 0, 20, 16, 19, 0),
+    gsSP2Triangles(17, 22, 23, 0, 17, 23, 18, 0),
+    gsSP2Triangles(24, 25, 19, 0, 24, 19, 18, 0),
+    gsSP2Triangles(26, 24, 18, 0, 26, 18, 23, 0),
+    gsSP2Triangles(25, 27, 20, 0, 25, 20, 19, 0),
     gsSP2Triangles(25, 28, 29, 0, 25, 24, 28, 0),
-    gsSP1Quadrangle(30, 27, 25, 29, 0),
+    gsSP2Triangles(30, 27, 25, 0, 30, 25, 29, 0),
     gsSP2Triangles(9, 8, 14, 0, 15, 13, 14, 0),
     gsSPVertex(0x04015100, 32, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
     gsSP2Triangles(0, 2, 4, 0, 3, 5, 1, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
     gsSP2Triangles(6, 9, 10, 0, 11, 6, 10, 0),
     gsSP2Triangles(12, 11, 13, 0, 11, 14, 13, 0),
     gsSP2Triangles(11, 10, 14, 0, 15, 12, 13, 0),
     gsSP2Triangles(9, 14, 10, 0, 15, 13, 14, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(18, 20, 21, 19, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(18, 20, 21, 0, 18, 21, 19, 0),
     gsSP2Triangles(20, 22, 21, 0, 2, 23, 4, 0),
     gsSP2Triangles(1, 5, 2, 0, 24, 25, 26, 0),
     gsSP2Triangles(24, 26, 27, 0, 26, 28, 29, 0),
@@ -5754,17 +5754,17 @@ Gfx d_course_wario_stadium_packed_dl_9590[] =
     gsSPVertex(0x04015300, 31, 0),
     gsSP2Triangles(0, 1, 2, 0, 1, 3, 4, 0),
     gsSP2Triangles(1, 4, 2, 0, 0, 2, 5, 0),
-    gsSP1Quadrangle(6, 7, 0, 5, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(10, 12, 13, 11, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
+    gsSP2Triangles(6, 7, 0, 0, 6, 0, 5, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(10, 12, 13, 0, 10, 13, 11, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
     gsSP2Triangles(15, 18, 16, 0, 18, 19, 16, 0),
-    gsSP1Quadrangle(12, 20, 21, 13, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
+    gsSP2Triangles(12, 20, 21, 0, 12, 21, 13, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
     gsSP2Triangles(26, 27, 28, 0, 27, 29, 28, 0),
     gsSP1Triangle(29, 30, 28, 0),
     gsSPVertex(0x040154F0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(2, 4, 3, 0, 5, 6, 7, 0),
     gsSP2Triangles(5, 7, 8, 0, 6, 9, 7, 0),
     gsSP2Triangles(9, 10, 7, 0, 9, 11, 10, 0),
@@ -5783,21 +5783,21 @@ Gfx d_course_wario_stadium_packed_dl_9668[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040155B0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 0, 0),
-    gsSP1Quadrangle(7, 4, 0, 3, 0),
-    gsSP1Quadrangle(6, 8, 1, 0, 0),
-    gsSP1Quadrangle(1, 9, 10, 2, 0),
-    gsSP1Quadrangle(8, 11, 9, 1, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 0, 0),
+    gsSP2Triangles(7, 4, 0, 0, 7, 0, 3, 0),
+    gsSP2Triangles(6, 8, 1, 0, 6, 1, 0, 0),
+    gsSP2Triangles(1, 9, 10, 0, 1, 10, 2, 0),
+    gsSP2Triangles(8, 11, 9, 0, 8, 9, 1, 0),
     gsSP2Triangles(12, 13, 14, 0, 13, 15, 16, 0),
     gsSP2Triangles(13, 16, 14, 0, 15, 17, 18, 0),
     gsSP2Triangles(15, 18, 16, 0, 19, 20, 21, 0),
     gsSP2Triangles(20, 22, 21, 0, 22, 23, 21, 0),
     gsSP2Triangles(22, 24, 23, 0, 22, 25, 24, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
-    gsSP1Quadrangle(28, 30, 31, 29, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
+    gsSP2Triangles(28, 30, 31, 0, 28, 31, 29, 0),
     gsSPVertex(0x040157B0, 18, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 5, 7, 8, 0),
     gsSP2Triangles(5, 8, 6, 0, 7, 9, 8, 0),
     gsSP2Triangles(9, 10, 8, 0, 11, 12, 13, 0),
@@ -5818,7 +5818,7 @@ Gfx d_course_wario_stadium_packed_dl_9760[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040158D0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 5, 7, 6, 0),
     gsSP2Triangles(7, 8, 6, 0, 9, 10, 11, 0),
     gsSP2Triangles(12, 9, 11, 0, 10, 13, 14, 0),
@@ -5846,11 +5846,11 @@ Gfx d_course_wario_stadium_packed_dl_9820[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04015B80, 20, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5866,26 +5866,26 @@ Gfx d_course_wario_stadium_packed_dl_98A0[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04015CC0, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(7, 8, 9, 4, 0),
-    gsSP1Quadrangle(10, 9, 8, 11, 0),
-    gsSP1Quadrangle(12, 2, 1, 13, 0),
-    gsSP1Quadrangle(14, 15, 12, 13, 0),
-    gsSP1Quadrangle(14, 16, 17, 15, 0),
-    gsSP1Quadrangle(18, 17, 16, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(20, 23, 10, 11, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 26, 25, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(7, 8, 9, 0, 7, 9, 4, 0),
+    gsSP2Triangles(10, 9, 8, 0, 10, 8, 11, 0),
+    gsSP2Triangles(12, 2, 1, 0, 12, 1, 13, 0),
+    gsSP2Triangles(14, 15, 12, 0, 14, 12, 13, 0),
+    gsSP2Triangles(14, 16, 17, 0, 14, 17, 15, 0),
+    gsSP2Triangles(18, 17, 16, 0, 18, 16, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(20, 23, 10, 0, 20, 10, 11, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 26, 25, 0, 28, 25, 29, 0),
     gsSPVertex(0x04015EA0, 16, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 4, 5, 0, 0),
-    gsSP1Quadrangle(1, 6, 7, 2, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(8, 12, 13, 9, 0),
-    gsSP1Quadrangle(10, 5, 4, 11, 0),
-    gsSP1Quadrangle(14, 13, 12, 15, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 4, 5, 0, 3, 5, 0, 0),
+    gsSP2Triangles(1, 6, 7, 0, 1, 7, 2, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(8, 12, 13, 0, 8, 13, 9, 0),
+    gsSP2Triangles(10, 5, 4, 0, 10, 4, 11, 0),
+    gsSP2Triangles(14, 13, 12, 0, 14, 12, 15, 0),
     gsSPEndDisplayList(),
 };
 
@@ -5901,11 +5901,11 @@ Gfx d_course_wario_stadium_packed_dl_9998[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04015FA0, 31, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
     gsSP2Triangles(4, 6, 5, 0, 7, 8, 9, 0),
     gsSP2Triangles(7, 9, 10, 0, 8, 11, 9, 0),
-    gsSP1Quadrangle(12, 13, 7, 10, 0),
+    gsSP2Triangles(12, 13, 7, 0, 12, 7, 10, 0),
     gsSP2Triangles(14, 15, 16, 0, 15, 17, 18, 0),
     gsSP2Triangles(15, 18, 16, 0, 19, 14, 16, 0),
     gsSP2Triangles(19, 16, 20, 0, 21, 22, 23, 0),
@@ -5913,22 +5913,22 @@ Gfx d_course_wario_stadium_packed_dl_9998[] =
     gsSP2Triangles(25, 27, 28, 0, 29, 27, 26, 0),
     gsSP1Triangle(29, 26, 30, 0),
     gsSPVertex(0x04016190, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(1, 4, 5, 2, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(7, 10, 11, 8, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(15, 14, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(7, 10, 11, 0, 7, 11, 8, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(15, 14, 16, 0, 15, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
     gsSP2Triangles(22, 18, 21, 0, 19, 23, 24, 0),
     gsSP2Triangles(19, 24, 20, 0, 10, 25, 26, 0),
     gsSP2Triangles(10, 26, 11, 0, 27, 28, 13, 0),
     gsSP2Triangles(27, 13, 12, 0, 29, 30, 31, 0),
     gsSPVertex(0x04016390, 14, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 3, 6, 0),
-    gsSP1Quadrangle(7, 8, 9, 10, 0),
-    gsSP1Quadrangle(9, 11, 12, 10, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 3, 0, 4, 3, 6, 0),
+    gsSP2Triangles(7, 8, 9, 0, 7, 9, 10, 0),
+    gsSP2Triangles(9, 11, 12, 0, 9, 12, 10, 0),
     gsSP1Triangle(11, 13, 12, 0),
     gsSPEndDisplayList(),
 };
@@ -5945,48 +5945,48 @@ Gfx d_course_wario_stadium_packed_dl_9AD8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04016470, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 4, 7, 9, 0),
-    gsSP1Quadrangle(5, 10, 11, 6, 0),
-    gsSP1Quadrangle(12, 8, 9, 13, 0),
-    gsSP1Quadrangle(14, 12, 13, 15, 0),
-    gsSP1Quadrangle(16, 14, 15, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 18, 21, 23, 0),
-    gsSP1Quadrangle(19, 24, 25, 20, 0),
-    gsSP1Quadrangle(26, 22, 23, 27, 0),
-    gsSP1Quadrangle(27, 28, 29, 26, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 4, 7, 0, 8, 7, 9, 0),
+    gsSP2Triangles(5, 10, 11, 0, 5, 11, 6, 0),
+    gsSP2Triangles(12, 8, 9, 0, 12, 9, 13, 0),
+    gsSP2Triangles(14, 12, 13, 0, 14, 13, 15, 0),
+    gsSP2Triangles(16, 14, 15, 0, 16, 15, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 18, 21, 0, 22, 21, 23, 0),
+    gsSP2Triangles(19, 24, 25, 0, 19, 25, 20, 0),
+    gsSP2Triangles(26, 22, 23, 0, 26, 23, 27, 0),
+    gsSP2Triangles(27, 28, 29, 0, 27, 29, 26, 0),
     gsSPVertex(0x04016650, 30, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 2, 1, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 10, 13, 15, 0),
-    gsSP1Quadrangle(11, 16, 17, 12, 0),
-    gsSP1Quadrangle(18, 14, 15, 19, 0),
-    gsSP1Quadrangle(9, 18, 19, 6, 0),
-    gsSP1Quadrangle(16, 20, 21, 17, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(20, 22, 25, 21, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 2, 1, 0, 4, 1, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 10, 13, 0, 14, 13, 15, 0),
+    gsSP2Triangles(11, 16, 17, 0, 11, 17, 12, 0),
+    gsSP2Triangles(18, 14, 15, 0, 18, 15, 19, 0),
+    gsSP2Triangles(9, 18, 19, 0, 9, 19, 6, 0),
+    gsSP2Triangles(16, 20, 21, 0, 16, 21, 17, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(20, 22, 25, 0, 20, 25, 21, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
     gsSPVertex(0x04016830, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 0, 3, 5, 0),
-    gsSP1Quadrangle(1, 6, 7, 2, 0),
-    gsSP1Quadrangle(8, 4, 5, 9, 0),
-    gsSP1Quadrangle(10, 7, 6, 11, 0),
-    gsSP1Quadrangle(12, 10, 11, 13, 0),
-    gsSP1Quadrangle(14, 12, 13, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(17, 8, 9, 18, 0),
-    gsSP1Quadrangle(20, 14, 15, 21, 0),
-    gsSP1Quadrangle(22, 23, 24, 25, 0),
-    gsSP1Quadrangle(26, 22, 25, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 0, 3, 0, 4, 3, 5, 0),
+    gsSP2Triangles(1, 6, 7, 0, 1, 7, 2, 0),
+    gsSP2Triangles(8, 4, 5, 0, 8, 5, 9, 0),
+    gsSP2Triangles(10, 7, 6, 0, 10, 6, 11, 0),
+    gsSP2Triangles(12, 10, 11, 0, 12, 11, 13, 0),
+    gsSP2Triangles(14, 12, 13, 0, 14, 13, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(17, 8, 9, 0, 17, 9, 18, 0),
+    gsSP2Triangles(20, 14, 15, 0, 20, 15, 21, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0),
+    gsSP2Triangles(26, 22, 25, 0, 26, 25, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04016A30, 8, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6002,11 +6002,11 @@ Gfx d_course_wario_stadium_packed_dl_9C80[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04016AB0, 14, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 2, 1, 5, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(9, 10, 11, 6, 0),
-    gsSP1Quadrangle(12, 8, 7, 13, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 2, 1, 0, 4, 1, 5, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(9, 10, 11, 0, 9, 11, 6, 0),
+    gsSP2Triangles(12, 8, 7, 0, 12, 7, 13, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6022,10 +6022,10 @@ Gfx d_course_wario_stadium_packed_dl_9D00[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04016B90, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(5, 8, 9, 6, 0),
-    gsSP1Quadrangle(10, 0, 3, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(5, 8, 9, 0, 5, 9, 6, 0),
+    gsSP2Triangles(10, 0, 3, 0, 10, 3, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6086,10 +6086,10 @@ Gfx d_course_wario_stadium_packed_dl_9EE0[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x04016DB0, 10, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(3, 4, 5, 0, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(4, 6, 9, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(3, 4, 5, 0, 3, 5, 0, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(4, 6, 9, 0, 4, 9, 5, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6103,55 +6103,55 @@ Gfx d_course_wario_stadium_packed_dl_9F28[] =
 {
     gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
     gsSPVertex(0x04016E50, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(2, 4, 5, 3, 0),
-    gsSP1Quadrangle(5, 4, 6, 7, 0),
-    gsSP1Quadrangle(6, 8, 9, 7, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(8, 11, 10, 9, 0),
-    gsSP1Quadrangle(12, 14, 15, 13, 0),
-    gsSP1Quadrangle(16, 17, 1, 0, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 18, 21, 23, 0),
-    gsSP1Quadrangle(19, 24, 25, 20, 0),
-    gsSP1Quadrangle(26, 27, 28, 29, 0),
-    gsSP1Quadrangle(24, 26, 29, 25, 0),
-    gsSP1Quadrangle(27, 30, 31, 28, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0),
+    gsSP2Triangles(5, 4, 6, 0, 5, 6, 7, 0),
+    gsSP2Triangles(6, 8, 9, 0, 6, 9, 7, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(8, 11, 10, 0, 8, 10, 9, 0),
+    gsSP2Triangles(12, 14, 15, 0, 12, 15, 13, 0),
+    gsSP2Triangles(16, 17, 1, 0, 16, 1, 0, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 18, 21, 0, 22, 21, 23, 0),
+    gsSP2Triangles(19, 24, 25, 0, 19, 25, 20, 0),
+    gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0),
+    gsSP2Triangles(24, 26, 29, 0, 24, 29, 25, 0),
+    gsSP2Triangles(27, 30, 31, 0, 27, 31, 28, 0),
     gsSPVertex(0x04017050, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 0, 3, 5, 0),
-    gsSP1Quadrangle(1, 6, 7, 2, 0),
-    gsSP1Quadrangle(6, 8, 9, 7, 0),
-    gsSP1Quadrangle(10, 11, 12, 13, 0),
-    gsSP1Quadrangle(14, 15, 16, 17, 0),
-    gsSP1Quadrangle(18, 19, 20, 21, 0),
-    gsSP1Quadrangle(22, 23, 18, 21, 0),
-    gsSP1Quadrangle(24, 25, 23, 22, 0),
-    gsSP1Quadrangle(26, 27, 25, 24, 0),
-    gsSP1Quadrangle(20, 19, 28, 29, 0),
-    gsSP1Quadrangle(28, 30, 31, 29, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 0, 3, 0, 4, 3, 5, 0),
+    gsSP2Triangles(1, 6, 7, 0, 1, 7, 2, 0),
+    gsSP2Triangles(6, 8, 9, 0, 6, 9, 7, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
+    gsSP2Triangles(22, 23, 18, 0, 22, 18, 21, 0),
+    gsSP2Triangles(24, 25, 23, 0, 24, 23, 22, 0),
+    gsSP2Triangles(26, 27, 25, 0, 26, 25, 24, 0),
+    gsSP2Triangles(20, 19, 28, 0, 20, 28, 29, 0),
+    gsSP2Triangles(28, 30, 31, 0, 28, 31, 29, 0),
     gsSPVertex(0x04017250, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 1, 0, 0),
-    gsSP1Quadrangle(6, 7, 8, 9, 0),
-    gsSP1Quadrangle(10, 6, 9, 11, 0),
-    gsSP1Quadrangle(7, 12, 13, 8, 0),
-    gsSP1Quadrangle(12, 14, 15, 13, 0),
-    gsSP1Quadrangle(14, 16, 17, 15, 0),
-    gsSP1Quadrangle(16, 18, 19, 17, 0),
-    gsSP1Quadrangle(18, 20, 21, 19, 0),
-    gsSP1Quadrangle(22, 10, 11, 23, 0),
-    gsSP1Quadrangle(24, 22, 23, 25, 0),
-    gsSP1Quadrangle(20, 26, 27, 21, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0),
+    gsSP2Triangles(10, 6, 9, 0, 10, 9, 11, 0),
+    gsSP2Triangles(7, 12, 13, 0, 7, 13, 8, 0),
+    gsSP2Triangles(12, 14, 15, 0, 12, 15, 13, 0),
+    gsSP2Triangles(14, 16, 17, 0, 14, 17, 15, 0),
+    gsSP2Triangles(16, 18, 19, 0, 16, 19, 17, 0),
+    gsSP2Triangles(18, 20, 21, 0, 18, 21, 19, 0),
+    gsSP2Triangles(22, 10, 11, 0, 22, 11, 23, 0),
+    gsSP2Triangles(24, 22, 23, 0, 24, 23, 25, 0),
+    gsSP2Triangles(20, 26, 27, 0, 20, 27, 21, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsSPVertex(0x04017450, 18, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(5, 8, 9, 6, 0),
-    gsSP1Quadrangle(10, 0, 3, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(13, 16, 17, 14, 0),
-    gsSP1Quadrangle(16, 10, 11, 17, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(5, 8, 9, 0, 5, 9, 6, 0),
+    gsSP2Triangles(10, 0, 3, 0, 10, 3, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(13, 16, 17, 0, 13, 17, 14, 0),
+    gsSP2Triangles(16, 10, 11, 0, 16, 11, 17, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6173,9 +6173,9 @@ Gfx d_course_wario_stadium_packed_dl_A0D8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04017570, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6191,9 +6191,9 @@ Gfx d_course_wario_stadium_packed_dl_A148[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x04017630, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6209,9 +6209,9 @@ Gfx d_course_wario_stadium_packed_dl_A1B8[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040176F0, 12, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsSPEndDisplayList(),
 };
 
@@ -6235,14 +6235,14 @@ Gfx d_course_wario_stadium_packed_dl_A248[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsSPVertex(0x040177B0, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 6, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x007C),
@@ -6252,42 +6252,42 @@ Gfx d_course_wario_stadium_packed_dl_A248[] =
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040179B0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x05009800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x040179F0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500A800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04017A30, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500B800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04017A70, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500C800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04017AB0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x0500D800),
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
     gsSPVertex(0x04017AF0, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
diff --git a/include/PR/gbi.h b/include/PR/gbi.h
index 1141a2256..6680268e8 100644
--- a/include/PR/gbi.h
+++ b/include/PR/gbi.h
@@ -148,13 +148,15 @@
 #define G_LINE3D		(G_IMMFIRST-10)
 #define G_RDPHALF_1		(G_IMMFIRST-11)
 #define G_RDPHALF_2		(G_IMMFIRST-12)
+#define G_RDPHALF_CONT	(G_IMMFIRST-13) // From F3D_OLD used to render lap & timer UI.
 #if (defined(F3DEX_GBI)||defined(F3DLP_GBI))
-#  define G_MODIFYVTX		(G_IMMFIRST-13)
+#ifndef F3D_OLD
+#  define G_MODIFYVTX		(G_IMMFIRST-13) // older versions of f3dex still used G_RDPHALF_CONT
+#endif
 #  define G_TRI2		(G_IMMFIRST-14)
 #  define G_BRANCH_Z		(G_IMMFIRST-15)
 #  define G_LOAD_UCODE		(G_IMMFIRST-16)
 #  define G_QUAD            (G_IMMFIRST-10)
-#  define G_RDPHALF_CONT	(G_IMMFIRST-13) // From F3D_OLD used to render lap & timer UI.
 #endif
 
 /* We are overloading 2 of the immediate commands
@@ -474,8 +476,6 @@
 #define G_ACMUX_PRIM_LOD_FRAC	6
 #define G_ACMUX_1		        6
 #define G_ACMUX_0		        7
-// Invalid alpha combiner constant for unused func_8004B5A8.
-#define G_ACMUX_PRIMITIVE_ALPHA 10
 
 /* typical CC cycle 1 modes */
 #define	G_CC_PRIMITIVE              0, 0, 0, PRIMITIVE, 0, 0, 0, PRIMITIVE
@@ -2010,6 +2010,12 @@ typedef union {
 #  define __gsSPLine3D_w1f(v0, v1, wd, flag)			\
      (((flag) == 0) ? __gsSPLine3D_w1(v0, v1, wd):		\
 	              __gsSPLine3D_w1(v1, v0, wd))
+
+// Only used on old F3DEX revisions, removed on latest revisions.
+#define __gsSP1Quadrangle_w1(v0, v1, v2, v3)			\
+     (_SHIFTL((v3)*2,24,8)|_SHIFTL((v0)*2,16,8)|\
+	  _SHIFTL((v1)*2,8,8)|_SHIFTL((v2)*2,0,8))
+
 #  define __gsSP1Quadrangle_w1f(v0, v1, v2, v3, flag)	\
   (((flag) == 0) ? __gsSP1Triangle_w1(v0, v1, v2):      \
    ((flag) == 1) ? __gsSP1Triangle_w1(v1, v2, v3):      \
@@ -2161,6 +2167,27 @@ typedef union {
 	__gsSPLine3D_w1f(v0, v1, wd, flag)				\
 }}
 
+// Early revision of quadrangle command uses G_QUAD instead of G_TRI2.
+// It does not have a flag argument, this was added for compatibility.
+// MK64: Appears to only be used in startup_logo.inc.c
+#ifdef F3D_OLD
+/***
+ ***  1 Quadrangle
+ ***/
+#define gSP1Quadrangle(v0, v1, v2, v3, flag)                  \
+{{                                                            \
+        Gfx *_g = (Gfx *)(pkt);                               \
+                                                              \
+        _g->words.w0 = _SHIFTL(G_QUAD, 24, 8);                \
+        _g->words.w1 =  __gsSP1Quadrangle_w1(v0, v1, v2, v3); \
+}}
+
+#define gsSP1Quadrangle(v0, v1, v2, v3, flag)                 \
+{{                                                            \
+        _SHIFTL(G_QUAD, 24, 8),                               \
+        __gsSP1Quadrangle_w1(v0, v1, v2, v3)                  \
+}}
+#else
 /***
  ***  1 Quadrangle
  ***/
@@ -2173,27 +2200,13 @@ typedef union {
         _g->words.w1 =  __gsSP1Quadrangle_w2f(v0, v1, v2, v3, flag);    \
 }
 
-// Unmodified gsSP1Quadrangle
 #define gsSP1Quadrangle(v0, v1, v2, v3, flag)                           \
 {{                                                                      \
         (_SHIFTL(G_TRI2, 24, 8)|                                        \
          __gsSP1Quadrangle_w1f(v0, v1, v2, v3, flag)),                  \
          __gsSP1Quadrangle_w2f(v0, v1, v2, v3, flag)                    \
 }}
-/**
- * Modified to match startup_logo.inc.c
- * Likely due to a development version of gbi.h
- */
-#define __mk_gsSP1Triangle_w1(v0, v1, v2, v3)			                \
-     (_SHIFTL((v3)*2,24,8)|_SHIFTL((v0)*2,16,8)|\
-	  _SHIFTL((v1)*2,8,8)|_SHIFTL((v2)*2,0,8))
-
-#define mk_gsSP1Quadrangle(v0, v1, v2, v3)                                 \
-{{                                                                      \
-        _SHIFTL(G_QUAD, 24, 8),                                         \
-        __mk_gsSP1Triangle_w1(v0, v1, v2, v3)                           \
-}}
-
+#endif
 #endif	/* F3DEX_GBI_2 */
 
 #if	(defined(F3DLP_GBI)||defined(F3DEX_GBI))
@@ -2226,6 +2239,7 @@ typedef union {
 	gsSP1Triangle(v10, v11, v12, flag1)
 #endif	/* F3DEX_GBI/F3DLP_GBI */
 
+#ifndef F3D_OLD
 #if	(defined(F3DEX_GBI)||defined(F3DLP_GBI))
 #define gSPCullDisplayList(pkt,vstart,vend)				\
 {									\
@@ -2241,8 +2255,8 @@ typedef union {
 	_SHIFTL(G_CULLDL, 24, 8) | _SHIFTL((vstart)*2, 0, 16),		\
 	_SHIFTL((vend)*2, 0, 16)					\
 }}
-
-#else
+#endif
+#else /* F3D_OLD */
 #define gSPCullDisplayList(pkt,vstart,vend)				\
 {									\
 	Gfx *_g = (Gfx *)(pkt);						\
@@ -2282,12 +2296,12 @@ typedef union {
 /*
  * r should be one of: FRUSTRATIO_1, FRUSTRATIO_2, FRUSTRATIO_3, ... FRUSTRATIO_6
  */
-#define gSPClipRatio(pkt)						\
+#define gSPClipRatio(pkt, r)						\
 {									\
-	gMoveWd(pkt, G_MW_CLIP, G_MWO_CLIP_RNX, FR_NEG_FRUSTRATIO_1);		\
-	gMoveWd(pkt, G_MW_CLIP, G_MWO_CLIP_RNY, FR_NEG_FRUSTRATIO_1);		\
-	gMoveWd(pkt, G_MW_CLIP, G_MWO_CLIP_RPX, FR_POS_FRUSTRATIO_1);		\
-	gMoveWd(pkt, G_MW_CLIP, G_MWO_CLIP_RPY, FR_POS_FRUSTRATIO_1);		\
+	gMoveWd(pkt, G_MW_CLIP, G_MWO_CLIP_RNX, FR_NEG_##r);		\
+	gMoveWd(pkt, G_MW_CLIP, G_MWO_CLIP_RNY, FR_NEG_##r);		\
+	gMoveWd(pkt, G_MW_CLIP, G_MWO_CLIP_RPX, FR_POS_##r);		\
+	gMoveWd(pkt, G_MW_CLIP, G_MWO_CLIP_RPY, FR_POS_##r);		\
 }
 
 #define gsSPClipRatio(r)						\
@@ -4494,16 +4508,6 @@ typedef union {
 	 _SHIFTL(sB, 0, 8))						\
 }}
 
-// Current spot for custom raw gDPHalf1 commands
-// that mk64 seems to use
-
-#define gDPHalf1(pkt, data) \
-{ \
-	Gfx *_g = pkt; \
-	_g->words.w0 = _SHIFTL(G_RDPHALF_1, 24, 8);    \
-	_g->words.w1 = data;    \
-}
-
 #define gDPNoParam(pkt, cmd)						\
 {									\
 	Gfx *_g = (Gfx *)(pkt);						\
diff --git a/include/PR/sptask.h b/include/PR/sptask.h
index 8f23c1b2d..034922784 100644
--- a/include/PR/sptask.h
+++ b/include/PR/sptask.h
@@ -1,20 +1,142 @@
-#ifndef _ULTRA64_SPTASK_H_
-#define _ULTRA64_SPTASK_H_
+/**************************************************************************
+ *									  *
+ *		 Copyright (C) 1995, Silicon Graphics, Inc.		  *
+ *									  *
+ *  These coded instructions, statements, and computer programs  contain  *
+ *  unpublished  proprietary  information of Silicon Graphics, Inc., and  *
+ *  are protected by Federal copyright law.  They  may  not be disclosed  *
+ *  to  third  parties  or copied or duplicated in any form, in whole or  *
+ *  in part, without the prior written consent of Silicon Graphics, Inc.  *
+ *									  *
+ **************************************************************************/
 
-/* Task Types */
-#define M_GFXTASK 1
-#define M_AUDTASK 2
-#define M_VIDTASK 3
-#define M_HVQTASK 6
-#define M_HVQMTASK 7
+/**************************************************************************
+ *
+ *  $Revision: 1.9 $
+ *  $Date: 1998/03/05 06:40:29 $
+ *  $Source: /exdisk2/cvs/N64OS/Master/cvsmdev2/PR/include/sptask.h,v $
+ *
+ **************************************************************************/
 
+#ifndef _SPTASK_H_
+#define	_SPTASK_H_
+
+#ifdef _LANGUAGE_C_PLUS_PLUS
+extern "C" {
+#endif
+
+#include <PR/ultratypes.h>
+
+#if defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS)
+
+/**************************************************************************
+ *
+ * Type definitions
+ *
+ */
+
+/*
+ * Task List Structure.
+ *
+ * Things an app might pass to the SP via the task list.
+ * Not every task ucode would need/use every field, but
+ *
+ *	- type (audio, gfx, video, ...)
+ *	- flags
+ *		- wait for DP to drain before running new task
+ *		- SEE BIT DEFINITIONS UNDER "Task Flags field"
+ *	- pointer to boot ucode
+ *	- size of boot ucode
+ *	- pointer to ucode
+ *	- size of ucode
+ *	- pointer to initial DMEM data
+ *	- size of initial DMEM data 
+ *	- pointer to DRAM stack
+ *	- size of DRAM stack (max)
+ *	- pointer to output buffer
+ *	- pointer to store output buffer length
+ *	- generic data pointer (for display list, etc.)
+ *	- generic data length (for display list, etc.)
+ *	- pointer to buffer where to store saved DMEM (in yield case)
+ *	- size of buffer to store saved DMEM.
+ *
+ * IMPORTANT!!! Watch alignment issues.
+ *
+ * IMPORTANT!!! Watch data cache issues.  The RCP may write data into the
+ * dram_stack, output_buff, output_buff_size, and the yield_data_ptr areas.
+ * These buffers should be cache aligned and use the entire line (16 bytes) to
+ * avoid corruption by writebacks by the CPU (cache tearing).
+ *
+ * IMPORTANT!!! all addresses are virtual addresses. Library does
+ * any necessary translation.
+ *
+ */
+typedef struct
+{
+    /*0x00*/ u32 type;
+    /*0x04*/ u32 flags;
+
+    /*0x08*/ u64 *ucode_boot;
+    /*0x0C*/ u32 ucode_boot_size;
+
+    /*0x10*/ u64 *ucode;
+    /*0x14*/ u32 ucode_size;
+
+    /*0x18*/ u64 *ucode_data;
+    /*0x1C*/ u32 ucode_data_size;
+
+    /*0x20*/ u64 *dram_stack;
+    /*0x24*/ u32 dram_stack_size;
+
+    /*0x28*/ u64 *output_buff;
+    /*0x2C*/ u64 *output_buff_size;
+
+    /*0x30*/ u64 *data_ptr;
+    /*0x34*/ u32 data_size;
+
+    /*0x38*/ u64 *yield_data_ptr;
+    /*0x3C*/ u32 yield_data_size;
+} OSTask_t; // size = 0x40
+
+typedef union {
+    OSTask_t t;
+    long long int force_structure_alignment;
+} OSTask;
+
+typedef u32 OSYieldResult;
+#endif /* _LANGUAGE_C */
+
+
+/*
+ * Task Flags field
+ */
+#define OS_TASK_YIELDED			0x0001
+#define OS_TASK_DP_WAIT			0x0002
+#define	OS_TASK_LOADABLE		0x0004
+#define	OS_TASK_SP_ONLY			0x0008
+#define OS_TASK_USR0			0x0010
+#define OS_TASK_USR1			0x0020
+#define OS_TASK_USR2			0x0040
+#define OS_TASK_USR3			0x0080
+
+/*
+ * Size of Yield buffer.  The taskHdrPtr->t.yield_data_ptr must point to a 
+ * buffer of this size.  (The size is in bytes).  ONLY If the task will NEVER
+ * yield it may be a null pointer.  The buffer must be aligned to a 64 bit
+ * boundary.  The taskHdrPtr->t.yield_data_ptr must be set to point to the
+ * buffer BEFORE the task is started.
+ */
 #if (defined(F3DEX_GBI) || defined(F3DLP_GBI) || defined(F3DEX_GBI_2))
-#define OS_YIELD_DATA_SIZE 0xc00
+#ifdef F3D_OLD
+#define OS_YIELD_DATA_SIZE 0xD00
+#else
+#define OS_YIELD_DATA_SIZE 0xC00
+#endif
 #else
 #define OS_YIELD_DATA_SIZE 0x900
 #endif
-#define OS_YIELD_AUDIO_SIZE 0x400
 
+// TODO: These defines shouldn't exist - PR/rcp.h has them properly defined (ultralib)
 /* Flags  */
 #define M_TASK_FLAG0 1
 #define M_TASK_FLAG1 2
@@ -62,52 +184,47 @@
 #define SPSTATUS_SIGNAL6_SET 0x2000
 #define SPSTATUS_SIGNAL7_SET 0x4000
 
-/* Types */
-/* Types */
+#if defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS)
 
-typedef struct
-{
-    /*0x00*/ u32 type;
-    /*0x04*/ u32 flags;
-
-    /*0x08*/ u64 *ucode_boot;
-    /*0x0C*/ u32 ucode_boot_size;
-
-    /*0x10*/ u64 *ucode;
-    /*0x14*/ u32 ucode_size;
-
-    /*0x18*/ u64 *ucode_data;
-    /*0x1C*/ u32 ucode_data_size;
-
-    /*0x20*/ u64 *dram_stack;
-    /*0x24*/ u32 dram_stack_size;
-
-    /*0x28*/ u64 *output_buff;
-    /*0x2C*/ u64 *output_buff_size;
-
-    /*0x30*/ u64 *data_ptr;
-    /*0x34*/ u32 data_size;
-
-    /*0x38*/ u64 *yield_data_ptr;
-    /*0x3C*/ u32 yield_data_size;
-} OSTask_t; // size = 0x40
-
-typedef union {
-    OSTask_t t;
-    long long int force_structure_alignment;
-} OSTask;
-
-typedef u32 OSYieldResult;
-
-/* Functions */
+/**************************************************************************
+ *
+ * Macro definitions
+ *
+ */
 
+/*
+ * this macro simulates atomic action.
+ */
 #define osSpTaskStart(p) \
     osSpTaskLoad(p);     \
     osSpTaskStartGo(p);
 
-void osSpTaskLoad(OSTask *task);
-void osSpTaskStartGo(OSTask *task);
-void osSpTaskYield(void);
-OSYieldResult osSpTaskYielded(OSTask *task);
+/**************************************************************************
+ *
+ * Extern variables
+ *
+ */
 
+
+/**************************************************************************
+ *
+ * Function prototypes
+ *
+ */
+
+/*
+ * break this up into two steps for debugging.
+ */
+extern void osSpTaskLoad(OSTask *task);
+extern void osSpTaskStartGo(OSTask *task);
+
+extern void osSpTaskYield(void);
+extern OSYieldResult osSpTaskYielded(OSTask *task);
+
+#endif /* _LANGUAGE_C */
+
+#ifdef _LANGUAGE_C_PLUS_PLUS
+}
 #endif
+
+#endif /* !_SPTASK_H */
diff --git a/src/actors.c b/src/actors.c
index 655ba5071..77fcc3c10 100644
--- a/src/actors.c
+++ b/src/actors.c
@@ -3727,14 +3727,14 @@ void func_802A171C(Camera *camera, struct FakeItemBox *fakeItemBox) {
         } else if ((fakeItemBox->rot[1] >= 0xC711) && (fakeItemBox->rot[1] < 0xD1BA)) {
             gDPSetRenderMode(gDisplayListHead++, G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2);
         } else {
-            gDPNoOp(gDisplayListHead++);
+            gDPSetBlendMask(gDisplayListHead++, 0xFF);
             gDPSetRenderMode(gDisplayListHead++, G_RM_ZB_CLD_SURF, G_RM_ZB_CLD_SURF2);
         }
         gSPDisplayList(gDisplayListHead++, D_0D003090);
     } else {
         gSPClearGeometryMode(gDisplayListHead++, G_LIGHTING);
         gSPClearGeometryMode(gDisplayListHead++, G_CULL_BACK);
-        gDPNoOp(gDisplayListHead++);
+        gDPSetBlendMask(gDisplayListHead++, 0xFF);
         thing = fakeItemBox->someTimer;
         func_802B5F74(someMatrix2, fakeItemBox->pos, fakeItemBox->rot);
         if (thing < 10.0f) {
@@ -3873,7 +3873,7 @@ void func_802A1EA0(Camera *camera, struct ItemBox *item_box) {
             } else if ((item_box->rot[1] >= 0xC711) && (item_box->rot[1] < 0xD1BA)) {
                 gDPSetRenderMode(gDisplayListHead++, G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2);
             } else {
-                gDPNoOp(gDisplayListHead++);
+                gDPSetBlendMask(gDisplayListHead++, 0xFF);
                 gDPSetRenderMode(gDisplayListHead++, G_RM_ZB_CLD_SURF, G_RM_ZB_CLD_SURF2);
             }
             gSPSetGeometryMode(gDisplayListHead++, G_SHADING_SMOOTH);
@@ -3881,7 +3881,7 @@ void func_802A1EA0(Camera *camera, struct ItemBox *item_box) {
         } else {
             gSPClearGeometryMode(gDisplayListHead++, G_LIGHTING);
             gSPClearGeometryMode(gDisplayListHead++, G_CULL_BACK);
-            gDPNoOp(gDisplayListHead++);
+            gDPSetBlendMask(gDisplayListHead++, 0xFF);
             thing = item_box->someTimer;
             func_802B5F74(someMatrix1, item_box->pos, item_box->rot);
             if (thing < 10.0f) {
diff --git a/src/code_80091750.c b/src/code_80091750.c
index 54ba7c50a..4a573f1fc 100644
--- a/src/code_80091750.c
+++ b/src/code_80091750.c
@@ -2526,7 +2526,7 @@ void func_80094660(struct GfxPool *arg0, UNUSED s32 arg1) {
     move_segment_table_to_dmem();
     gDPSetTexturePersp(gDisplayListHead++, G_TP_PERSP);
     guPerspective(&arg0->mtxPool[0], &perspNorm, 45.0f, 1.3333334f, 100.0f, 12800.0f, 1.0f);
-    gDPHalf1(gDisplayListHead++, perspNorm);
+    gSPPerspNormalize(gDisplayListHead++, perspNorm);
     guLookAt(&arg0->mtxPool[7], 0.0f, 0.0f, (f32) D_8018EDC0, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f);
     func_800942D0();
     gDPPipeSync(gDisplayListHead++);
@@ -2538,7 +2538,7 @@ void func_800947B4(struct GfxPool *arg0, UNUSED s32 arg1) {
     u16 perspNorm;
     move_segment_table_to_dmem();
     guPerspective(&arg0->mtxPool[1], &perspNorm, 45.0f, 1.3333334f, 100.0f, 12800.0f, 1.0f);
-    gDPHalf1(gDisplayListHead++, perspNorm);
+    gSPPerspNormalize(gDisplayListHead++, perspNorm);
     guLookAt(&arg0->mtxPool[8], 0.0f, 0.0f, (f32) D_8018EDC0, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f);
     guRotate(&arg0->mtxPool[0x32B], D_8018EDC8, 1.0f, 0, 0);
     guRotate(&arg0->mtxPool[0x32C], D_8018EDCC, 0, 1.0f, 0);
diff --git a/src/code_80280000.c b/src/code_80280000.c
index 940339b10..78c52aa2f 100644
--- a/src/code_80280000.c
+++ b/src/code_80280000.c
@@ -52,7 +52,7 @@ void func_80280038(void) {
     
     gSPSetGeometryMode(gDisplayListHead++, G_ZBUFFER | G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH);
     guPerspective(&gGfxPool->mtxPool[1], &perspNorm, D_80150130[0], D_80150148, D_80150150, D_8015014C, 1.0f);
-    gDPHalf1(gDisplayListHead++, perspNorm);
+    gSPPerspNormalize(gDisplayListHead++, perspNorm);
     gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxPool[1]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
     guLookAt(&gGfxPool->mtxPool[7], camera->pos[0], camera->pos[1], camera->pos[2], camera->lookAt[0], camera->lookAt[1], camera->lookAt[2], camera->up[0], camera->up[1], camera->up[2]);
     gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxPool[7]), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION);
diff --git a/src/code_80281C40.c b/src/code_80281C40.c
index 04faed7f0..3c6b2c5f1 100644
--- a/src/code_80281C40.c
+++ b/src/code_80281C40.c
@@ -65,7 +65,7 @@ void func_80281D00(void) {
     func_8028150C();
     gSPSetGeometryMode(gDisplayListHead++, G_ZBUFFER | G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH);
     guPerspective((Mtx*) &gGfxPool->mtxPool[1], &perspNorm, D_80150130[0], D_80150148, D_80150150, D_8015014C, 1.0f);
-    gDPHalf1(gDisplayListHead++, perspNorm);
+    gSPPerspNormalize(gDisplayListHead++, perspNorm);
     gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxPool[1]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
     guLookAt((Mtx*) &gGfxPool->mtxPool[7], camera->pos[0], camera->pos[1], camera->pos[2], camera->lookAt[0], camera->lookAt[1], camera->lookAt[2], camera->up[0], camera->up[1], camera->up[2]);
     gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxPool[7]), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION);
diff --git a/src/common_textures.inc.c b/src/common_textures.inc.c
index 77d093320..6f29fe862 100644
--- a/src/common_textures.inc.c
+++ b/src/common_textures.inc.c
@@ -223,21 +223,21 @@ Gfx D_0D001840[] = {
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0xFC, 0x7C),
     gsDPLoadTextureBlock(0x03004000, G_IM_FMT_CI, G_IM_SIZ_8b, 64, 32, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD),
     gsSPVertex(D_0D001390, 32, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPLoadTextureBlock(0x03004800, G_IM_FMT_CI, G_IM_SIZ_8b, 64, 32, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPLoadTextureBlock(0x03005000, G_IM_FMT_CI, G_IM_SIZ_8b, 64, 32, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
     gsDPLoadTextureBlock(0x03005800, G_IM_FMT_CI, G_IM_SIZ_8b, 64, 32, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
     gsDPLoadTextureBlock(0x03006000, G_IM_FMT_CI, G_IM_SIZ_8b, 64, 32, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
     gsDPLoadTextureBlock(0x03006800, G_IM_FMT_CI, G_IM_SIZ_8b, 64, 32, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsDPLoadTextureBlock(0x03007000, G_IM_FMT_CI, G_IM_SIZ_8b, 64, 32, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD),
-    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0),
     gsDPLoadTextureBlock(0x03007800, G_IM_FMT_CI, G_IM_SIZ_8b, 64, 32, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD),
-    gsSP1Quadrangle(28, 29, 30, 31, 0),
+    gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPEndDisplayList(),
 };
@@ -251,18 +251,18 @@ Gfx D_0D001AB8[] = {
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 124, 124),
     gsSPVertex(D_0D001590, 24, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
-    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, 0x03008800),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 124, 124),
-    gsSP1Quadrangle(8, 9, 10, 11, 0),
-    gsSP1Quadrangle(12, 13, 14, 15, 0),
-    gsSP1Quadrangle(16, 17, 18, 19, 0),
-    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
+    gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
+    gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
     gsSPSetGeometryMode(G_CULL_BACK),
     gsSPEndDisplayList(),
 };
@@ -271,7 +271,7 @@ Gfx D_0D001B68[] = {
     gsSPTexture(1, 1, 0, G_TX_RENDERTILE, G_OFF),
     gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
     gsSPVertex(D_0D001710, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPEndDisplayList(),
 };
 
@@ -402,7 +402,7 @@ Gfx D_0D002EE8[] = {
     gsDPPipeSync(),
     gsSPTexture(0xFFFF, 0xFFFF, 1, 1, G_OFF),
     gsSPClearGeometryMode(G_LIGHTING),
-    gsDPNoOp(),
+    gsDPSetBlendMask(0xFF),
     gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
     gsDPSetRenderMode(G_RM_ZB_CLD_SURF, G_RM_ZB_CLD_SURF2),
     gsSPVertex(D_0D001CE8, 4, 0),
@@ -434,7 +434,7 @@ Gfx D_0D002F80[] = {
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(D_0D002F40, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPSetGeometryMode(G_CULL_BACK),
     gsSPEndDisplayList(),
 };
@@ -454,7 +454,7 @@ Gfx D_0D003008[] = {
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 256),
     gsSPVertex(D_0D001D28, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPSetGeometryMode(G_CULL_BACK),
     gsSPEndDisplayList(),
 };
@@ -667,7 +667,7 @@ Gfx D_0D0052B8[] = {
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 124, 124),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSPTexture(0xFFFF, 0xFFFF, 1, 1, G_OFF),
     gsDPPipeSync(),
     gsSPEndDisplayList(),
@@ -685,7 +685,7 @@ Gfx D_0D005308[] = {
 Gfx D_0D005338[] = {
     gsSPDisplayList(D_0D005308),
     gsSPVertex(D_0D005238, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureLUT(G_TT_NONE),
     gsDPPipeSync(),
     gsSPEndDisplayList(),
@@ -694,7 +694,7 @@ Gfx D_0D005338[] = {
 Gfx D_0D005368[] = {
     gsSPDisplayList(D_0D005308),
     gsSPVertex(D_0D005278, 4, 0),
-    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsDPSetTextureLUT(G_TT_NONE),
     gsDPPipeSync(),
     gsSPEndDisplayList(),
@@ -1266,7 +1266,7 @@ Gfx D_0D0076F8[] = {
     gsDPSetCombineKey(G_CK_NONE),
     gsDPSetAlphaCompare(G_AC_NONE),
     gsDPSetRenderMode(G_RM_OPA_SURF, G_RM_OPA_SURF2),
-    gsDPNoOp(),
+    gsDPSetBlendMask(0xFF),
     gsDPSetColorDither(G_CD_DISABLE),
     gsSPSetGeometryMode(G_SHADE | G_CULL_BACK),
     gsSPClearGeometryMode(G_LIGHTING),
@@ -2150,7 +2150,7 @@ Gfx D_0D008D58[] = {
     gsDPPipeSync(),
     gsDPSetTexturePersp(G_TP_PERSP),
     gsSPClearGeometryMode(G_LIGHTING),
-    gsDPNoOp(),
+    gsDPSetBlendMask(0xFF),
     gsDPSetTextureFilter(G_TF_BILERP),
     gsSPTexture(32768, 32768, 0, G_TX_RENDERTILE, G_ON),
     gsDPSetRenderMode(G_RM_ZB_CLD_SURF, G_RM_ZB_CLD_SURF2),
@@ -2168,7 +2168,7 @@ Gfx D_0D008DB8[] = {
     gsDPPipeSync(),
     gsDPSetTexturePersp(G_TP_PERSP),
     gsSPClearGeometryMode(G_LIGHTING),
-    gsDPNoOp(),
+    gsDPSetBlendMask(0xFF),
     gsDPSetTextureFilter(G_TF_BILERP),
     gsSPTexture(32768, 32768, 0, G_TX_RENDERTILE, G_ON),
     gsDPSetTextureLUT(G_TT_NONE),
diff --git a/src/gbiMacro.c b/src/gbiMacro.c
index 37baa4b66..1952caea4 100644
--- a/src/gbiMacro.c
+++ b/src/gbiMacro.c
@@ -16,7 +16,7 @@ UNUSED void gfx_func_80040D00(void) {
     gDPSetRenderMode(gDisplayListHead++, G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2);
     gSPClearGeometryMode(gDisplayListHead++, G_LIGHTING);
     guOrtho(&gGfxPool->mtxPool[0], 0.0f, 320.0f, 0.0f, 240.0f, -1.0f, 1.0f, 1.0f);
-    gDPHalf1(gDisplayListHead++, 0x0000FFFF);
+    gSPPerspNormalize(gDisplayListHead++, 0xFFFF);
     gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(gGfxPool), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
     gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&D_0D008E98), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-}
\ No newline at end of file
+}
diff --git a/src/main.c b/src/main.c
index b68c1b151..5da3474fe 100644
--- a/src/main.c
+++ b/src/main.c
@@ -260,10 +260,13 @@ void create_gfx_task_structure(void) {
     gGfxSPTask->msgqueue = &gGfxVblankQueue;
     gGfxSPTask->msg = (OSMesg) 2;
     gGfxSPTask->task.t.type = M_GFXTASK;
-    gGfxSPTask->task.t.flags = (1 << 1);
+    gGfxSPTask->task.t.flags = OS_TASK_DP_WAIT;
     gGfxSPTask->task.t.ucode_boot = rspbootTextStart;
     gGfxSPTask->task.t.ucode_boot_size = ((u8 *) rspbootTextEnd - (u8 *) rspbootTextStart);
-    if (gGamestate != RACING || gPlayerCountSelection1 - 1 == 0) {
+    // Use F3DEX on non-racing states and if there's only one player.
+    // Otherwise use F3DLX which has a simple subpixel calculation.
+    // http://n64devkit.square7.ch/n64man/ucode/gspF3DEX.htm
+    if (gGamestate != RACING || gPlayerCountSelection1 == 1) {
         gGfxSPTask->task.t.ucode = gspF3DEXTextStart;
         gGfxSPTask->task.t.ucode_data = gspF3DEXDataStart;
     } else {
@@ -271,7 +274,7 @@ void create_gfx_task_structure(void) {
         gGfxSPTask->task.t.ucode_data = gspF3DLXDataStart;
     }
     gGfxSPTask->task.t.flags = 0;
-    gGfxSPTask->task.t.flags = (1 << 1);
+    gGfxSPTask->task.t.flags = OS_TASK_DP_WAIT;
     gGfxSPTask->task.t.ucode_size = SP_UCODE_SIZE;
     gGfxSPTask->task.t.ucode_data_size = SP_UCODE_DATA_SIZE;
     gGfxSPTask->task.t.dram_stack = (u64 *) &gGfxSPTaskStack;
@@ -282,7 +285,7 @@ void create_gfx_task_structure(void) {
     gGfxSPTask->task.t.data_size = (gDisplayListHead - gGfxPool->gfxPool) * sizeof(Gfx);
     func_8008C214();
     gGfxSPTask->task.t.yield_data_ptr = (u64 *) &gGfxSPTaskYieldBuffer;
-    gGfxSPTask->task.t.yield_data_size = 0xD00; /* Not equal to OS_YIELD_DATA_SIZE */
+    gGfxSPTask->task.t.yield_data_size = OS_YIELD_DATA_SIZE;
 }
 
 
diff --git a/src/memory.c b/src/memory.c
index 5ca604110..a53316b53 100644
--- a/src/memory.c
+++ b/src/memory.c
@@ -524,7 +524,7 @@ void unpack_clear_geometry_mode(Gfx *arg0, UNUSED u8 *arg1, UNUSED s8 arg2) {
 }
 
 void unpack_cull_displaylist(Gfx *arg0, UNUSED u8 *arg1, UNUSED s8 arg2) {
-    Gfx macro[] = {gsSPCullDisplayList(0, 160)};
+    Gfx macro[] = {gsSPCullDisplayList(0, 7)};
     arg0[sGfxSeekPosition].words.w0 = macro->words.w0;
     arg0[sGfxSeekPosition].words.w1 = macro->words.w1;
     sGfxSeekPosition++;
diff --git a/src/render_courses.c b/src/render_courses.c
index ecb95f8a0..157e8f638 100644
--- a/src/render_courses.c
+++ b/src/render_courses.c
@@ -242,7 +242,7 @@ void func_8029122C(struct UnkStruct_800DC5EC *arg0, s32 arg1) {
             gSPTexture(gDisplayListHead++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON);
             gSPClearGeometryMode(gDisplayListHead++, G_LIGHTING);
             gDPSetRenderMode(gDisplayListHead++, G_RM_AA_ZB_XLU_INTER, G_RM_NOOP2);
-            gDPNoOp(gDisplayListHead++);
+            gDPSetBlendMask(gDisplayListHead++, 0xFF);
             gDPSetCombineMode(gDisplayListHead++, G_CC_MODULATEIA, G_CC_MODULATEIA);
             gSPDisplayList(gDisplayListHead++, 0x07000878);
             gDPSetAlphaCompare(gDisplayListHead++, G_AC_NONE);
@@ -254,7 +254,7 @@ void func_8029122C(struct UnkStruct_800DC5EC *arg0, s32 arg1) {
             gSPTexture(gDisplayListHead++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON);
             gSPClearGeometryMode(gDisplayListHead++, G_LIGHTING);
             gDPSetRenderMode(gDisplayListHead++, G_RM_AA_ZB_XLU_INTER, G_RM_NOOP2);
-            gDPNoOp(gDisplayListHead++);
+            gDPSetBlendMask(gDisplayListHead++, 0xFF);
             gDPSetCombineMode(gDisplayListHead++, G_CC_MODULATEIA, G_CC_MODULATEIA);
 
             switch (pathCounter) {
@@ -276,7 +276,7 @@ void func_8029122C(struct UnkStruct_800DC5EC *arg0, s32 arg1) {
             func_802B4FF8(matrix, 0);
 
             gDPSetRenderMode(gDisplayListHead++, G_RM_AA_ZB_XLU_INTER, G_RM_NOOP2);
-            gDPNoOp(gDisplayListHead++);
+            gDPSetBlendMask(gDisplayListHead++, 0xFF);
             gDPSetCombineMode(gDisplayListHead++, G_CC_MODULATEIA, G_CC_MODULATEIA);
             gSPClearGeometryMode(gDisplayListHead++, G_CULL_BACK);
             load_surface_map(d_course_koopa_troopa_beach_dl_list2, arg0);
@@ -290,7 +290,7 @@ void func_8029122C(struct UnkStruct_800DC5EC *arg0, s32 arg1) {
             gDPPipeSync(gDisplayListHead++);
             gSPClearGeometryMode(gDisplayListHead++, G_LIGHTING);
             gSPTexture(gDisplayListHead++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON);
-            gDPNoOp(gDisplayListHead++);
+            gDPSetBlendMask(gDisplayListHead++, 0xFF);
             gDPSetCombineMode(gDisplayListHead++, G_CC_MODULATEIA, G_CC_MODULATEIA);
             gDPSetTextureFilter(gDisplayListHead++, G_TF_BILERP);
             gDPSetTexturePersp(gDisplayListHead++, G_TP_PERSP);
@@ -323,7 +323,7 @@ void func_8029122C(struct UnkStruct_800DC5EC *arg0, s32 arg1) {
             gSPTexture(gDisplayListHead++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON);
             gSPClearGeometryMode(gDisplayListHead++, G_LIGHTING);
             gDPSetRenderMode(gDisplayListHead++, G_RM_AA_ZB_XLU_INTER, G_RM_NOOP2);
-            gDPNoOp(gDisplayListHead++);
+            gDPSetBlendMask(gDisplayListHead++, 0xFF);
             gDPSetCombineMode(gDisplayListHead++, G_CC_MODULATEIA, G_CC_MODULATEIA);
             gDPSetTextureFilter(gDisplayListHead++, G_TF_BILERP);
             gDPSetTexturePersp(gDisplayListHead++, G_TP_PERSP);
@@ -345,7 +345,7 @@ void func_8029122C(struct UnkStruct_800DC5EC *arg0, s32 arg1) {
             gDPPipeSync(gDisplayListHead++);
             gSPClearGeometryMode(gDisplayListHead++, G_LIGHTING);
             gSPTexture(gDisplayListHead++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON);
-            gDPNoOp(gDisplayListHead++);
+            gDPSetBlendMask(gDisplayListHead++, 0xFF);
             gDPSetTextureFilter(gDisplayListHead++, G_TF_BILERP);
             gDPSetTexturePersp(gDisplayListHead++, G_TP_PERSP);
 
diff --git a/src/skybox_and_splitscreen.c b/src/skybox_and_splitscreen.c
index 91baf858b..2ca26c537 100644
--- a/src/skybox_and_splitscreen.c
+++ b/src/skybox_and_splitscreen.c
@@ -225,11 +225,10 @@ void init_rdp(void) {
     gDPSetCombineKey(gDisplayListHead++, G_CK_NONE);
     gDPSetAlphaCompare(gDisplayListHead++, G_AC_NONE);
     gDPSetRenderMode(gDisplayListHead++, G_RM_OPA_SURF, G_RM_OPA_SURF2);
-    gDPNoOp(gDisplayListHead++);
+    gDPSetBlendMask(gDisplayListHead++, 0xFF);
     gDPSetColorDither(gDisplayListHead++, G_CD_DISABLE);
     gDPPipeSync(gDisplayListHead++);
-    gSPClipRatio(gDisplayListHead++);
-    // F3DEX2 may need FRUSTRATIO_1 as an argument to clip ratio.
+    gSPClipRatio(gDisplayListHead++, FRUSTRATIO_1);
 }
 
 UNUSED void func_802A40A4(void) {}
@@ -437,7 +436,7 @@ void func_802A487C(Vtx *arg0, UNUSED struct UnkStruct_800DC5EC *arg1, UNUSED s32
         gDPSetRenderMode(gDisplayListHead++, G_RM_OPA_SURF, G_RM_OPA_SURF2);
         gSPClearGeometryMode(gDisplayListHead++, G_ZBUFFER | G_LIGHTING);
         guOrtho(&gGfxPool->mtxPool[0], 0.0f, 320.0f, 0.0f, 240.0f, 0.0f, 5.0f, 1.0f);
-        gDPHalf1(gDisplayListHead++, 0xFFFF);
+        gSPPerspNormalize(gDisplayListHead++, 0xFFFF);
         gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxPool[0]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
         gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&D_0D008E98), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPVertex(gDisplayListHead++, &arg0[4], 4, 0);
@@ -489,7 +488,7 @@ void func_802A4A0C(Vtx *vtx, struct UnkStruct_800DC5EC *arg1, UNUSED s32 arg2, U
     gDPSetRenderMode(gDisplayListHead++, G_RM_OPA_SURF, G_RM_OPA_SURF2);
     gSPClearGeometryMode(gDisplayListHead++, G_ZBUFFER | G_LIGHTING);
     guOrtho(&gGfxPool->mtxPool[0], 0.0f, SCREEN_WIDTH, 0.0f, SCREEN_HEIGHT, 0.0f, 5.0f, 1.0f);
-    gDPHalf1(gDisplayListHead++, 0xFFFF);
+    gSPPerspNormalize(gDisplayListHead++, 0xFFFF);
     gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxPool[0]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
     gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&D_0D008E98), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPVertex(gDisplayListHead++, &vtx[0], 4, 0);
@@ -780,7 +779,7 @@ void func_802A59A4(void) {
     gSPSetGeometryMode(gDisplayListHead++, G_ZBUFFER | G_SHADE | G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH);
     gDPSetRenderMode(gDisplayListHead++, G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2);
     guPerspective(&gGfxPool->mtxPool[1], &perspNorm, D_80150130[0], D_80150148, D_80150150, D_8015014C, 1.0f);
-    gDPHalf1(gDisplayListHead++, perspNorm);
+    gSPPerspNormalize(gDisplayListHead++, perspNorm);
     gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxPool[1]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
 
     guLookAt(&gGfxPool->mtxPool[7], camera->pos[0], camera->pos[1], camera->pos[2],
@@ -828,7 +827,7 @@ void func_802A5CB4(void) {
 
     gSPSetGeometryMode(gDisplayListHead++, G_ZBUFFER | G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH);
     guPerspective(&gGfxPool->mtxPool[1], &perspNorm, D_80150130[0], D_80150148, D_80150150, D_8015014C, 1.0f);
-    gDPHalf1(gDisplayListHead++, perspNorm);
+    gSPPerspNormalize(gDisplayListHead++, perspNorm);
     gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxPool[1]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
     guLookAt(&gGfxPool->mtxPool[7], camera->pos[0], camera->pos[1], camera->pos[2], camera->lookAt[0], camera->lookAt[1], camera->lookAt[2], camera->up[0], camera->up[1], camera->up[2]);
 
@@ -878,7 +877,7 @@ void func_802A5FAC(void) {
 
     gSPSetGeometryMode(gDisplayListHead++, G_ZBUFFER | G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH);
     guPerspective(&gGfxPool->mtxPool[2], &perspNorm, D_80150130[1], D_80150148, D_80150150, D_8015014C, 1.0f);
-    gDPHalf1(gDisplayListHead++, perspNorm);
+    gSPPerspNormalize(gDisplayListHead++, perspNorm);
     gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxPool[2]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
     guLookAt(&gGfxPool->mtxPool[8], camera->pos[0], camera->pos[1], camera->pos[2], camera->lookAt[0], camera->lookAt[1], camera->lookAt[2], camera->up[0], camera->up[1], camera->up[2]);
 
@@ -926,7 +925,7 @@ void func_802A62A4(void) {
 
     gSPSetGeometryMode(gDisplayListHead++, G_ZBUFFER | G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH);
     guPerspective(&gGfxPool->mtxPool[1], &perspNorm, D_80150130[0], D_80150148, D_80150150, D_8015014C, 1.0f);
-    gDPHalf1(gDisplayListHead++, perspNorm);
+    gSPPerspNormalize(gDisplayListHead++, perspNorm);
     gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxPool[1]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
     guLookAt(&gGfxPool->mtxPool[7], camera->pos[0], camera->pos[1], camera->pos[2], camera->lookAt[0], camera->lookAt[1], camera->lookAt[2], camera->up[0], camera->up[1], camera->up[2]);
 
@@ -976,7 +975,7 @@ void func_802A65B8(void) {
 
     gSPSetGeometryMode(gDisplayListHead++, G_ZBUFFER | G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH);
     guPerspective(&gGfxPool->mtxPool[2], &perspNorm, D_80150130[1], D_80150148, D_80150150, D_8015014C, 1.0f);
-    gDPHalf1(gDisplayListHead++, perspNorm);
+    gSPPerspNormalize(gDisplayListHead++, perspNorm);
     gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxPool[2]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
     guLookAt(&gGfxPool->mtxPool[8], camera->pos[0], camera->pos[1], camera->pos[2], camera->lookAt[0], camera->lookAt[1], camera->lookAt[2], camera->up[0], camera->up[1], camera->up[2]);
 
@@ -1023,7 +1022,7 @@ void func_802A68CC(void) {
 
     gSPSetGeometryMode(gDisplayListHead++, G_ZBUFFER | G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH);
     guPerspective(&gGfxPool->mtxPool[1], &perspNorm, D_80150130[0], D_80150148, D_80150150, D_8015014C, 1.0f);
-    gDPHalf1(gDisplayListHead++, perspNorm);
+    gSPPerspNormalize(gDisplayListHead++, perspNorm);
     gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxPool[1]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
     guLookAt(&gGfxPool->mtxPool[7], camera->pos[0], camera->pos[1], camera->pos[2], camera->lookAt[0], camera->lookAt[1], camera->lookAt[2], camera->up[0], camera->up[1], camera->up[2]);
 
@@ -1070,7 +1069,7 @@ void func_802A6BB0(void) {
 
     gSPSetGeometryMode(gDisplayListHead++, G_ZBUFFER | G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH);
     guPerspective(&gGfxPool->mtxPool[2], &perspNorm, D_80150130[1], D_80150148, D_80150150, D_8015014C, 1.0f);
-    gDPHalf1(gDisplayListHead++, perspNorm);
+    gSPPerspNormalize(gDisplayListHead++, perspNorm);
     gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxPool[2]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
 
     guLookAt(&gGfxPool->mtxPool[8], camera->pos[0], camera->pos[1], camera->pos[2], camera->lookAt[0], camera->lookAt[1], camera->lookAt[2], camera->up[0], camera->up[1], camera->up[2]);
@@ -1117,7 +1116,7 @@ void func_802A6E94(void) {
 
     gSPSetGeometryMode(gDisplayListHead++, G_ZBUFFER | G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH);
     guPerspective(&gGfxPool->mtxPool[3], &perspNorm, D_80150130[2], D_80150148, D_80150150, D_8015014C, 1.0f);
-    gDPHalf1(gDisplayListHead++, perspNorm);
+    gSPPerspNormalize(gDisplayListHead++, perspNorm);
     gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxPool[3]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
     guLookAt(&gGfxPool->mtxPool[9], camera->pos[0], camera->pos[1], camera->pos[2], camera->lookAt[0], camera->lookAt[1], camera->lookAt[2], camera->up[0], camera->up[1], camera->up[2]);
     if (D_800DC5C8 == 0) {
@@ -1173,7 +1172,7 @@ void func_802A7178(void) {
 
     gSPSetGeometryMode(gDisplayListHead++, G_ZBUFFER | G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH);
     guPerspective(&gGfxPool->mtxPool[4], &perspNorm, D_80150130[3], D_80150148, D_80150150, D_8015014C, 1.0f);
-    gDPHalf1(gDisplayListHead++, perspNorm);
+    gSPPerspNormalize(gDisplayListHead++, perspNorm);
     gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxPool[4]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
     guLookAt(&gGfxPool->mtxPool[10], camera->pos[0], camera->pos[1], camera->pos[2], camera->lookAt[0], camera->lookAt[1], camera->lookAt[2], camera->up[0], camera->up[1], camera->up[2]);
     if (D_800DC5C8 == 0) {
diff --git a/src/startup_logo.inc.c b/src/startup_logo.inc.c
index 17842c773..699184a2e 100644
--- a/src/startup_logo.inc.c
+++ b/src/startup_logo.inc.c
@@ -695,53 +695,53 @@ static Vtx startup_logo[] = {
 
 static Gfx startup_logo_dl[] = {
     gsSPVertex(&startup_logo[0], 32, 0),
-    mk_gsSP1Quadrangle(0, 1, 2, 3),
-    mk_gsSP1Quadrangle(4, 5, 1, 0),
-    mk_gsSP1Quadrangle(3, 2, 6, 7),
-    mk_gsSP1Quadrangle(8, 9, 5, 4),
-    mk_gsSP1Quadrangle(10, 11, 9, 8),
-    mk_gsSP1Quadrangle(12, 13, 11, 10),
-    mk_gsSP1Quadrangle(7, 6, 14, 15),
-    mk_gsSP1Quadrangle(16, 17, 18, 19),
-    mk_gsSP1Quadrangle(20, 21, 17, 16),
-    mk_gsSP1Quadrangle(19, 18, 22, 23),
-    mk_gsSP1Quadrangle(24, 25, 26, 27),
-    mk_gsSP1Quadrangle(28, 29, 25, 24),
-    mk_gsSP1Quadrangle(15, 14, 29, 28),
-    mk_gsSP1Quadrangle(30, 31, 13, 12),
+    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP1Quadrangle(4, 5, 1, 0, 0),
+    gsSP1Quadrangle(3, 2, 6, 7, 0),
+    gsSP1Quadrangle(8, 9, 5, 4, 0),
+    gsSP1Quadrangle(10, 11, 9, 8, 0),
+    gsSP1Quadrangle(12, 13, 11, 10, 0),
+    gsSP1Quadrangle(7, 6, 14, 15, 0),
+    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP1Quadrangle(20, 21, 17, 16, 0),
+    gsSP1Quadrangle(19, 18, 22, 23, 0),
+    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP1Quadrangle(28, 29, 25, 24, 0),
+    gsSP1Quadrangle(15, 14, 29, 28, 0),
+    gsSP1Quadrangle(30, 31, 13, 12, 0),
     gsSPVertex(&startup_logo[32], 32, 0),
-    mk_gsSP1Quadrangle(0, 1, 2, 3),
-    mk_gsSP1Quadrangle(4, 5, 1, 0),
-    mk_gsSP1Quadrangle(3, 2, 6, 7),
-    mk_gsSP1Quadrangle(8, 9, 5, 4),
-    mk_gsSP1Quadrangle(10, 11, 9, 8),
-    mk_gsSP1Quadrangle(7, 6, 12, 13),
-    mk_gsSP1Quadrangle(14, 15, 16, 17),
-    mk_gsSP1Quadrangle(18, 19, 15, 14),
-    mk_gsSP1Quadrangle(13, 12, 19, 18),
-    mk_gsSP1Quadrangle(20, 21, 22, 23),
-    mk_gsSP1Quadrangle(24, 25, 26, 27),
-    mk_gsSP1Quadrangle(28, 29, 25, 24),
-    mk_gsSP1Quadrangle(27, 26, 30, 31),
+    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP1Quadrangle(4, 5, 1, 0, 0),
+    gsSP1Quadrangle(3, 2, 6, 7, 0),
+    gsSP1Quadrangle(8, 9, 5, 4, 0),
+    gsSP1Quadrangle(10, 11, 9, 8, 0),
+    gsSP1Quadrangle(7, 6, 12, 13, 0),
+    gsSP1Quadrangle(14, 15, 16, 17, 0),
+    gsSP1Quadrangle(18, 19, 15, 14, 0),
+    gsSP1Quadrangle(13, 12, 19, 18, 0),
+    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP1Quadrangle(28, 29, 25, 24, 0),
+    gsSP1Quadrangle(27, 26, 30, 31, 0),
     gsSPVertex(&startup_logo[64], 32, 0),
-    mk_gsSP1Quadrangle(0, 1, 2, 3),
-    mk_gsSP1Quadrangle(4, 5, 1, 0),
-    mk_gsSP1Quadrangle(6, 7, 5, 4),
-    mk_gsSP1Quadrangle(8, 9, 10, 11),
-    mk_gsSP1Quadrangle(12, 13, 14, 15),
-    mk_gsSP1Quadrangle(16, 17, 13, 12),
-    mk_gsSP1Quadrangle(11, 10, 17, 16),
-    mk_gsSP1Quadrangle(18, 19, 7, 6),
-    mk_gsSP1Quadrangle(20, 21, 22, 23),
-    mk_gsSP1Quadrangle(24, 25, 21, 20),
-    mk_gsSP1Quadrangle(23, 22, 26, 27),
-    mk_gsSP1Quadrangle(28, 29, 25, 24),
-    mk_gsSP1Quadrangle(30, 31, 29, 28),
+    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP1Quadrangle(4, 5, 1, 0, 0),
+    gsSP1Quadrangle(6, 7, 5, 4, 0),
+    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP1Quadrangle(16, 17, 13, 12, 0),
+    gsSP1Quadrangle(11, 10, 17, 16, 0),
+    gsSP1Quadrangle(18, 19, 7, 6, 0),
+    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP1Quadrangle(24, 25, 21, 20, 0),
+    gsSP1Quadrangle(23, 22, 26, 27, 0),
+    gsSP1Quadrangle(28, 29, 25, 24, 0),
+    gsSP1Quadrangle(30, 31, 29, 28, 0),
     gsSPVertex(&startup_logo[96], 10, 0),
-    mk_gsSP1Quadrangle(0, 1, 2, 3),
-    mk_gsSP1Quadrangle(4, 5, 6, 7),
-    mk_gsSP1Quadrangle(8, 9, 5, 4),
-    mk_gsSP1Quadrangle(3, 2, 9, 8),
+    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP1Quadrangle(8, 9, 5, 4, 0),
+    gsSP1Quadrangle(3, 2, 9, 8, 0),
     gsSPEndDisplayList(),
 
 };
@@ -749,30 +749,30 @@ static Gfx startup_logo_dl[] = {
 static Gfx startup_logo_dl2[] = {
 
     gsSPVertex(&startup_logo[106], 30, 0),
-    mk_gsSP1Quadrangle(0, 1, 2, 3),
-    mk_gsSP1Quadrangle(4, 5, 1, 0),
-    mk_gsSP1Quadrangle(3, 2, 6, 7),
-    mk_gsSP1Quadrangle(8, 9, 5, 4),
-    mk_gsSP1Quadrangle(10, 11, 9, 8),
-    mk_gsSP1Quadrangle(12, 13, 11, 10),
-    mk_gsSP1Quadrangle(7, 6, 14, 15),
-    mk_gsSP1Quadrangle(16, 17, 18, 19),
-    mk_gsSP1Quadrangle(20, 21, 17, 16),
-    mk_gsSP1Quadrangle(22, 23, 21, 20),
-    mk_gsSP1Quadrangle(15, 14, 23, 22),
-    mk_gsSP1Quadrangle(24, 25, 26, 27),
-    mk_gsSP1Quadrangle(28, 29, 25, 24),
+    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP1Quadrangle(4, 5, 1, 0, 0),
+    gsSP1Quadrangle(3, 2, 6, 7, 0),
+    gsSP1Quadrangle(8, 9, 5, 4, 0),
+    gsSP1Quadrangle(10, 11, 9, 8, 0),
+    gsSP1Quadrangle(12, 13, 11, 10, 0),
+    gsSP1Quadrangle(7, 6, 14, 15, 0),
+    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP1Quadrangle(20, 21, 17, 16, 0),
+    gsSP1Quadrangle(22, 23, 21, 20, 0),
+    gsSP1Quadrangle(15, 14, 23, 22, 0),
+    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP1Quadrangle(28, 29, 25, 24, 0),
     gsSPVertex(&startup_logo[136], 22, 0),
-    mk_gsSP1Quadrangle(0, 1, 2, 3),
-    mk_gsSP1Quadrangle(4, 5, 1, 0),
-    mk_gsSP1Quadrangle(3, 2, 6, 7),
-    mk_gsSP1Quadrangle(8, 9, 5, 4),
-    mk_gsSP1Quadrangle(10, 11, 9, 8),
-    mk_gsSP1Quadrangle(12, 13, 11, 10),
-    mk_gsSP1Quadrangle(7, 6, 14, 15),
-    mk_gsSP1Quadrangle(16, 17, 18, 19),
-    mk_gsSP1Quadrangle(20, 21, 17, 16),
-    mk_gsSP1Quadrangle(15, 14, 21, 20),
+    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP1Quadrangle(4, 5, 1, 0, 0),
+    gsSP1Quadrangle(3, 2, 6, 7, 0),
+    gsSP1Quadrangle(8, 9, 5, 4, 0),
+    gsSP1Quadrangle(10, 11, 9, 8, 0),
+    gsSP1Quadrangle(12, 13, 11, 10, 0),
+    gsSP1Quadrangle(7, 6, 14, 15, 0),
+    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP1Quadrangle(20, 21, 17, 16, 0),
+    gsSP1Quadrangle(15, 14, 21, 20, 0),
     gsSPEndDisplayList(),
 
 };
@@ -780,274 +780,274 @@ static Gfx startup_logo_dl2[] = {
 static Gfx startup_logo_dl3[] = {
 
     gsSPVertex(&startup_logo[158], 30, 0),
-    mk_gsSP1Quadrangle(0, 1, 2, 3),
-    mk_gsSP1Quadrangle(4, 5, 1, 0),
-    mk_gsSP1Quadrangle(3, 2, 6, 7),
-    mk_gsSP1Quadrangle(8, 9, 5, 4),
-    mk_gsSP1Quadrangle(10, 11, 9, 8),
-    mk_gsSP1Quadrangle(12, 13, 11, 10),
-    mk_gsSP1Quadrangle(14, 15, 13, 12),
-    mk_gsSP1Quadrangle(7, 6, 16, 17),
-    mk_gsSP1Quadrangle(18, 19, 20, 21),
-    mk_gsSP1Quadrangle(22, 23, 19, 18),
-    mk_gsSP1Quadrangle(21, 20, 24, 25),
-    mk_gsSP1Quadrangle(26, 27, 23, 22),
-    mk_gsSP1Quadrangle(28, 29, 27, 26),
-    mk_gsSP1Quadrangle(17, 16, 29, 28),
+    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP1Quadrangle(4, 5, 1, 0, 0),
+    gsSP1Quadrangle(3, 2, 6, 7, 0),
+    gsSP1Quadrangle(8, 9, 5, 4, 0),
+    gsSP1Quadrangle(10, 11, 9, 8, 0),
+    gsSP1Quadrangle(12, 13, 11, 10, 0),
+    gsSP1Quadrangle(14, 15, 13, 12, 0),
+    gsSP1Quadrangle(7, 6, 16, 17, 0),
+    gsSP1Quadrangle(18, 19, 20, 21, 0),
+    gsSP1Quadrangle(22, 23, 19, 18, 0),
+    gsSP1Quadrangle(21, 20, 24, 25, 0),
+    gsSP1Quadrangle(26, 27, 23, 22, 0),
+    gsSP1Quadrangle(28, 29, 27, 26, 0),
+    gsSP1Quadrangle(17, 16, 29, 28, 0),
     gsSPVertex(&startup_logo[188], 30, 0),
-    mk_gsSP1Quadrangle(0, 1, 2, 3),
-    mk_gsSP1Quadrangle(4, 5, 1, 0),
-    mk_gsSP1Quadrangle(3, 2, 6, 7),
-    mk_gsSP1Quadrangle(8, 9, 5, 4),
-    mk_gsSP1Quadrangle(10, 11, 9, 8),
-    mk_gsSP1Quadrangle(12, 13, 11, 10),
-    mk_gsSP1Quadrangle(7, 6, 14, 15),
-    mk_gsSP1Quadrangle(16, 17, 18, 19),
-    mk_gsSP1Quadrangle(20, 21, 17, 16),
-    mk_gsSP1Quadrangle(22, 23, 21, 20),
-    mk_gsSP1Quadrangle(24, 25, 23, 22),
-    mk_gsSP1Quadrangle(15, 14, 25, 24),
-    mk_gsSP1Quadrangle(26, 27, 28, 29),
+    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP1Quadrangle(4, 5, 1, 0, 0),
+    gsSP1Quadrangle(3, 2, 6, 7, 0),
+    gsSP1Quadrangle(8, 9, 5, 4, 0),
+    gsSP1Quadrangle(10, 11, 9, 8, 0),
+    gsSP1Quadrangle(12, 13, 11, 10, 0),
+    gsSP1Quadrangle(7, 6, 14, 15, 0),
+    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP1Quadrangle(20, 21, 17, 16, 0),
+    gsSP1Quadrangle(22, 23, 21, 20, 0),
+    gsSP1Quadrangle(24, 25, 23, 22, 0),
+    gsSP1Quadrangle(15, 14, 25, 24, 0),
+    gsSP1Quadrangle(26, 27, 28, 29, 0),
     gsSPVertex(&startup_logo[218], 30, 0),
-    mk_gsSP1Quadrangle(0, 1, 2, 3),
-    mk_gsSP1Quadrangle(4, 5, 1, 0),
-    mk_gsSP1Quadrangle(3, 2, 6, 7),
-    mk_gsSP1Quadrangle(8, 9, 5, 4),
-    mk_gsSP1Quadrangle(10, 11, 9, 8),
-    mk_gsSP1Quadrangle(12, 13, 11, 10),
-    mk_gsSP1Quadrangle(14, 15, 13, 12),
-    mk_gsSP1Quadrangle(7, 6, 16, 17),
-    mk_gsSP1Quadrangle(18, 19, 20, 21),
-    mk_gsSP1Quadrangle(22, 23, 19, 18),
-    mk_gsSP1Quadrangle(24, 25, 23, 22),
-    mk_gsSP1Quadrangle(26, 27, 25, 24),
-    mk_gsSP1Quadrangle(17, 16, 27, 26),
-    mk_gsSP1Quadrangle(28, 29, 15, 14),
+    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP1Quadrangle(4, 5, 1, 0, 0),
+    gsSP1Quadrangle(3, 2, 6, 7, 0),
+    gsSP1Quadrangle(8, 9, 5, 4, 0),
+    gsSP1Quadrangle(10, 11, 9, 8, 0),
+    gsSP1Quadrangle(12, 13, 11, 10, 0),
+    gsSP1Quadrangle(14, 15, 13, 12, 0),
+    gsSP1Quadrangle(7, 6, 16, 17, 0),
+    gsSP1Quadrangle(18, 19, 20, 21, 0),
+    gsSP1Quadrangle(22, 23, 19, 18, 0),
+    gsSP1Quadrangle(24, 25, 23, 22, 0),
+    gsSP1Quadrangle(26, 27, 25, 24, 0),
+    gsSP1Quadrangle(17, 16, 27, 26, 0),
+    gsSP1Quadrangle(28, 29, 15, 14, 0),
     gsSPVertex(&startup_logo[248], 26, 0),
-    mk_gsSP1Quadrangle(0, 1, 2, 3),
-    mk_gsSP1Quadrangle(4, 5, 1, 0),
-    mk_gsSP1Quadrangle(6, 7, 5, 4),
-    mk_gsSP1Quadrangle(8, 9, 7, 6),
-    mk_gsSP1Quadrangle(10, 11, 9, 8),
-    mk_gsSP1Quadrangle(12, 13, 14, 15),
-    mk_gsSP1Quadrangle(15, 14, 16, 17),
-    mk_gsSP1Quadrangle(18, 19, 20, 21),
-    mk_gsSP1Quadrangle(22, 23, 19, 18),
-    mk_gsSP1Quadrangle(24, 25, 23, 22),
-    mk_gsSP1Quadrangle(17, 16, 25, 24),
+    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP1Quadrangle(4, 5, 1, 0, 0),
+    gsSP1Quadrangle(6, 7, 5, 4, 0),
+    gsSP1Quadrangle(8, 9, 7, 6, 0),
+    gsSP1Quadrangle(10, 11, 9, 8, 0),
+    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP1Quadrangle(15, 14, 16, 17, 0),
+    gsSP1Quadrangle(18, 19, 20, 21, 0),
+    gsSP1Quadrangle(22, 23, 19, 18, 0),
+    gsSP1Quadrangle(24, 25, 23, 22, 0),
+    gsSP1Quadrangle(17, 16, 25, 24, 0),
     gsSPEndDisplayList(),
 
 };
 
 static Gfx startup_logo_dl4[] = {
     gsSPVertex(&startup_logo[274], 30, 0),
-    mk_gsSP1Quadrangle(0, 1, 2, 3),
-    mk_gsSP1Quadrangle(4, 5, 1, 0),
-    mk_gsSP1Quadrangle(3, 2, 6, 7),
-    mk_gsSP1Quadrangle(8, 9, 5, 4),
-    mk_gsSP1Quadrangle(10, 11, 9, 8),
-    mk_gsSP1Quadrangle(11, 10, 12, 13),
-    mk_gsSP1Quadrangle(7, 6, 14, 15),
-    mk_gsSP1Quadrangle(16, 17, 18, 19),
-    mk_gsSP1Quadrangle(20, 21, 17, 16),
-    mk_gsSP1Quadrangle(22, 23, 21, 20),
-    mk_gsSP1Quadrangle(15, 14, 23, 22),
-    mk_gsSP1Quadrangle(24, 25, 26, 27),
-    mk_gsSP1Quadrangle(28, 29, 25, 24),
+    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP1Quadrangle(4, 5, 1, 0, 0),
+    gsSP1Quadrangle(3, 2, 6, 7, 0),
+    gsSP1Quadrangle(8, 9, 5, 4, 0),
+    gsSP1Quadrangle(10, 11, 9, 8, 0),
+    gsSP1Quadrangle(11, 10, 12, 13, 0),
+    gsSP1Quadrangle(7, 6, 14, 15, 0),
+    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP1Quadrangle(20, 21, 17, 16, 0),
+    gsSP1Quadrangle(22, 23, 21, 20, 0),
+    gsSP1Quadrangle(15, 14, 23, 22, 0),
+    gsSP1Quadrangle(24, 25, 26, 27, 0),
+    gsSP1Quadrangle(28, 29, 25, 24, 0),
     gsSPVertex(&startup_logo[304], 22, 0),
-    mk_gsSP1Quadrangle(0, 1, 2, 3),
-    mk_gsSP1Quadrangle(4, 5, 1, 0),
-    mk_gsSP1Quadrangle(3, 2, 6, 7),
-    mk_gsSP1Quadrangle(8, 9, 5, 4),
-    mk_gsSP1Quadrangle(10, 11, 9, 8),
-    mk_gsSP1Quadrangle(12, 13, 11, 10),
-    mk_gsSP1Quadrangle(7, 6, 14, 15),
-    mk_gsSP1Quadrangle(16, 17, 18, 19),
-    mk_gsSP1Quadrangle(20, 21, 17, 16),
-    mk_gsSP1Quadrangle(15, 14, 21, 20),
+    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP1Quadrangle(4, 5, 1, 0, 0),
+    gsSP1Quadrangle(3, 2, 6, 7, 0),
+    gsSP1Quadrangle(8, 9, 5, 4, 0),
+    gsSP1Quadrangle(10, 11, 9, 8, 0),
+    gsSP1Quadrangle(12, 13, 11, 10, 0),
+    gsSP1Quadrangle(7, 6, 14, 15, 0),
+    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP1Quadrangle(20, 21, 17, 16, 0),
+    gsSP1Quadrangle(15, 14, 21, 20, 0),
     gsSPEndDisplayList(),
 };
 
 static Gfx startup_logo_dl5[] = {
     gsSPVertex(&startup_logo[326], 32, 0),
-    mk_gsSP1Quadrangle(0, 1, 2, 3),
-    mk_gsSP1Quadrangle(4, 5, 1, 0),
-    mk_gsSP1Quadrangle(3, 2, 6, 7),
-    mk_gsSP1Quadrangle(8, 9, 5, 4),
-    mk_gsSP1Quadrangle(10, 11, 9, 8),
-    mk_gsSP1Quadrangle(12, 13, 11, 10),
-    mk_gsSP1Quadrangle(7, 6, 14, 15),
-    mk_gsSP1Quadrangle(16, 17, 18, 19),
-    mk_gsSP1Quadrangle(20, 21, 17, 16),
-    mk_gsSP1Quadrangle(19, 18, 22, 23),
-    mk_gsSP1Quadrangle(24, 25, 21, 20),
-    mk_gsSP1Quadrangle(26, 27, 28, 29),
-    mk_gsSP1Quadrangle(15, 14, 27, 26),
-    mk_gsSP1Quadrangle(29, 28, 30, 31),
+    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP1Quadrangle(4, 5, 1, 0, 0),
+    gsSP1Quadrangle(3, 2, 6, 7, 0),
+    gsSP1Quadrangle(8, 9, 5, 4, 0),
+    gsSP1Quadrangle(10, 11, 9, 8, 0),
+    gsSP1Quadrangle(12, 13, 11, 10, 0),
+    gsSP1Quadrangle(7, 6, 14, 15, 0),
+    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP1Quadrangle(20, 21, 17, 16, 0),
+    gsSP1Quadrangle(19, 18, 22, 23, 0),
+    gsSP1Quadrangle(24, 25, 21, 20, 0),
+    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP1Quadrangle(15, 14, 27, 26, 0),
+    gsSP1Quadrangle(29, 28, 30, 31, 0),
     gsSPVertex(&startup_logo[358], 32, 0),
-    mk_gsSP1Quadrangle(0, 1, 2, 3),
-    mk_gsSP1Quadrangle(4, 5, 6, 7),
-    mk_gsSP1Quadrangle(8, 9, 5, 4),
-    mk_gsSP1Quadrangle(7, 6, 10, 11),
-    mk_gsSP1Quadrangle(12, 13, 9, 8),
-    mk_gsSP1Quadrangle(14, 15, 13, 12),
-    mk_gsSP1Quadrangle(11, 10, 16, 17),
-    mk_gsSP1Quadrangle(18, 19, 1, 0),
-    mk_gsSP1Quadrangle(20, 21, 19, 18),
-    mk_gsSP1Quadrangle(17, 16, 21, 20),
-    mk_gsSP1Quadrangle(22, 23, 24, 25),
-    mk_gsSP1Quadrangle(26, 27, 28, 29),
-    mk_gsSP1Quadrangle(30, 31, 27, 26),
+    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP1Quadrangle(8, 9, 5, 4, 0),
+    gsSP1Quadrangle(7, 6, 10, 11, 0),
+    gsSP1Quadrangle(12, 13, 9, 8, 0),
+    gsSP1Quadrangle(14, 15, 13, 12, 0),
+    gsSP1Quadrangle(11, 10, 16, 17, 0),
+    gsSP1Quadrangle(18, 19, 1, 0, 0),
+    gsSP1Quadrangle(20, 21, 19, 18, 0),
+    gsSP1Quadrangle(17, 16, 21, 20, 0),
+    gsSP1Quadrangle(22, 23, 24, 25, 0),
+    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP1Quadrangle(30, 31, 27, 26, 0),
     gsSPVertex(&startup_logo[390], 32, 0),
-    mk_gsSP1Quadrangle(0, 1, 2, 3),
-    mk_gsSP1Quadrangle(4, 5, 6, 7),
-    mk_gsSP1Quadrangle(8, 9, 5, 4),
-    mk_gsSP1Quadrangle(10, 11, 9, 8),
-    mk_gsSP1Quadrangle(3, 2, 12, 13),
-    mk_gsSP1Quadrangle(14, 15, 16, 17),
-    mk_gsSP1Quadrangle(18, 19, 15, 14),
-    mk_gsSP1Quadrangle(13, 12, 19, 18),
-    mk_gsSP1Quadrangle(20, 21, 11, 10),
-    mk_gsSP1Quadrangle(22, 23, 24, 25),
-    mk_gsSP1Quadrangle(26, 27, 23, 22),
-    mk_gsSP1Quadrangle(25, 24, 28, 29),
-    mk_gsSP1Quadrangle(30, 31, 27, 26),
+    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP1Quadrangle(8, 9, 5, 4, 0),
+    gsSP1Quadrangle(10, 11, 9, 8, 0),
+    gsSP1Quadrangle(3, 2, 12, 13, 0),
+    gsSP1Quadrangle(14, 15, 16, 17, 0),
+    gsSP1Quadrangle(18, 19, 15, 14, 0),
+    gsSP1Quadrangle(13, 12, 19, 18, 0),
+    gsSP1Quadrangle(20, 21, 11, 10, 0),
+    gsSP1Quadrangle(22, 23, 24, 25, 0),
+    gsSP1Quadrangle(26, 27, 23, 22, 0),
+    gsSP1Quadrangle(25, 24, 28, 29, 0),
+    gsSP1Quadrangle(30, 31, 27, 26, 0),
     gsSPVertex(&startup_logo[422], 14, 0),
-    mk_gsSP1Quadrangle(0, 1, 2, 3),
-    mk_gsSP1Quadrangle(4, 5, 6, 7),
-    mk_gsSP1Quadrangle(8, 9, 10, 11),
-    mk_gsSP1Quadrangle(12, 13, 9, 8),
-    mk_gsSP1Quadrangle(7, 6, 13, 12),
+    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP1Quadrangle(12, 13, 9, 8, 0),
+    gsSP1Quadrangle(7, 6, 13, 12, 0),
     gsSPEndDisplayList(),
 };
 
 static Gfx startup_logo_dl6[] = {
     gsSPVertex(&startup_logo[436], 32, 0),
-    mk_gsSP1Quadrangle(0, 1, 2, 3),
-    mk_gsSP1Quadrangle(4, 5, 1, 0),
-    mk_gsSP1Quadrangle(3, 2, 6, 7),
-    mk_gsSP1Quadrangle(8, 9, 5, 4),
-    mk_gsSP1Quadrangle(10, 11, 9, 8),
-    mk_gsSP1Quadrangle(12, 13, 11, 10),
-    mk_gsSP1Quadrangle(7, 6, 14, 15),
-    mk_gsSP1Quadrangle(16, 17, 18, 19),
-    mk_gsSP1Quadrangle(20, 21, 17, 16),
-    mk_gsSP1Quadrangle(19, 18, 22, 23),
-    mk_gsSP1Quadrangle(24, 25, 21, 20),
-    mk_gsSP1Quadrangle(15, 14, 25, 24),
-    mk_gsSP1Quadrangle(26, 27, 13, 12),
-    mk_gsSP1Quadrangle(28, 29, 30, 31),
+    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP1Quadrangle(4, 5, 1, 0, 0),
+    gsSP1Quadrangle(3, 2, 6, 7, 0),
+    gsSP1Quadrangle(8, 9, 5, 4, 0),
+    gsSP1Quadrangle(10, 11, 9, 8, 0),
+    gsSP1Quadrangle(12, 13, 11, 10, 0),
+    gsSP1Quadrangle(7, 6, 14, 15, 0),
+    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP1Quadrangle(20, 21, 17, 16, 0),
+    gsSP1Quadrangle(19, 18, 22, 23, 0),
+    gsSP1Quadrangle(24, 25, 21, 20, 0),
+    gsSP1Quadrangle(15, 14, 25, 24, 0),
+    gsSP1Quadrangle(26, 27, 13, 12, 0),
+    gsSP1Quadrangle(28, 29, 30, 31, 0),
     gsSPVertex(&startup_logo[468], 32, 0),
-    mk_gsSP1Quadrangle(0, 1, 2, 3),
-    mk_gsSP1Quadrangle(4, 5, 6, 7),
-    mk_gsSP1Quadrangle(8, 9, 1, 0),
-    mk_gsSP1Quadrangle(10, 11, 9, 8),
-    mk_gsSP1Quadrangle(7, 6, 12, 13),
-    mk_gsSP1Quadrangle(14, 15, 16, 17),
-    mk_gsSP1Quadrangle(18, 19, 15, 14),
-    mk_gsSP1Quadrangle(13, 12, 19, 18),
-    mk_gsSP1Quadrangle(20, 21, 22, 23),
-    mk_gsSP1Quadrangle(24, 25, 21, 20),
-    mk_gsSP1Quadrangle(23, 22, 26, 27),
-    mk_gsSP1Quadrangle(28, 29, 25, 24),
-    mk_gsSP1Quadrangle(30, 31, 29, 28),
+    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP1Quadrangle(8, 9, 1, 0, 0),
+    gsSP1Quadrangle(10, 11, 9, 8, 0),
+    gsSP1Quadrangle(7, 6, 12, 13, 0),
+    gsSP1Quadrangle(14, 15, 16, 17, 0),
+    gsSP1Quadrangle(18, 19, 15, 14, 0),
+    gsSP1Quadrangle(13, 12, 19, 18, 0),
+    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP1Quadrangle(24, 25, 21, 20, 0),
+    gsSP1Quadrangle(23, 22, 26, 27, 0),
+    gsSP1Quadrangle(28, 29, 25, 24, 0),
+    gsSP1Quadrangle(30, 31, 29, 28, 0),
     gsSPVertex(&startup_logo[500], 32, 0),
-    mk_gsSP1Quadrangle(0, 1, 2, 3),
-    mk_gsSP1Quadrangle(4, 5, 6, 7),
-    mk_gsSP1Quadrangle(8, 9, 10, 11),
-    mk_gsSP1Quadrangle(12, 13, 9, 8),
-    mk_gsSP1Quadrangle(11, 10, 14, 15),
-    mk_gsSP1Quadrangle(16, 17, 13, 12),
-    mk_gsSP1Quadrangle(7, 6, 17, 16),
-    mk_gsSP1Quadrangle(18, 19, 1, 0),
-    mk_gsSP1Quadrangle(20, 21, 22, 23),
-    mk_gsSP1Quadrangle(24, 25, 21, 20),
-    mk_gsSP1Quadrangle(23, 22, 26, 27),
-    mk_gsSP1Quadrangle(28, 29, 25, 24),
-    mk_gsSP1Quadrangle(15, 14, 29, 28),
-    mk_gsSP1Quadrangle(27, 26, 30, 31),
+    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP1Quadrangle(12, 13, 9, 8, 0),
+    gsSP1Quadrangle(11, 10, 14, 15, 0),
+    gsSP1Quadrangle(16, 17, 13, 12, 0),
+    gsSP1Quadrangle(7, 6, 17, 16, 0),
+    gsSP1Quadrangle(18, 19, 1, 0, 0),
+    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP1Quadrangle(24, 25, 21, 20, 0),
+    gsSP1Quadrangle(23, 22, 26, 27, 0),
+    gsSP1Quadrangle(28, 29, 25, 24, 0),
+    gsSP1Quadrangle(15, 14, 29, 28, 0),
+    gsSP1Quadrangle(27, 26, 30, 31, 0),
     gsSPVertex(&startup_logo[532], 8, 0),
-    mk_gsSP1Quadrangle(0, 1, 2, 3),
-    mk_gsSP1Quadrangle(4, 5, 1, 0),
-    mk_gsSP1Quadrangle(6, 7, 5, 4),
+    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP1Quadrangle(4, 5, 1, 0, 0),
+    gsSP1Quadrangle(6, 7, 5, 4, 0),
     gsSPEndDisplayList(),
 
 };
 
 static Gfx startup_logo_dl7[] = {
     gsSPVertex(&startup_logo[540], 32, 0),
-    mk_gsSP1Quadrangle(0, 1, 2, 3),
-    mk_gsSP1Quadrangle(4, 5, 1, 0),
-    mk_gsSP1Quadrangle(3, 2, 6, 7),
-    mk_gsSP1Quadrangle(7, 6, 8, 9),
-    mk_gsSP1Quadrangle(9, 8, 10, 11),
-    mk_gsSP1Quadrangle(11, 10, 12, 13),
-    mk_gsSP1Quadrangle(13, 12, 14, 15),
-    mk_gsSP1Quadrangle(16, 17, 5, 4),
-    mk_gsSP1Quadrangle(18, 19, 20, 21),
-    mk_gsSP1Quadrangle(22, 23, 24, 25),
-    mk_gsSP1Quadrangle(25, 24, 26, 27),
-    mk_gsSP1Quadrangle(27, 26, 17, 16),
-    mk_gsSP1Quadrangle(28, 29, 30, 31),
+    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP1Quadrangle(4, 5, 1, 0, 0),
+    gsSP1Quadrangle(3, 2, 6, 7, 0),
+    gsSP1Quadrangle(7, 6, 8, 9, 0),
+    gsSP1Quadrangle(9, 8, 10, 11, 0),
+    gsSP1Quadrangle(11, 10, 12, 13, 0),
+    gsSP1Quadrangle(13, 12, 14, 15, 0),
+    gsSP1Quadrangle(16, 17, 5, 4, 0),
+    gsSP1Quadrangle(18, 19, 20, 21, 0),
+    gsSP1Quadrangle(22, 23, 24, 25, 0),
+    gsSP1Quadrangle(25, 24, 26, 27, 0),
+    gsSP1Quadrangle(27, 26, 17, 16, 0),
+    gsSP1Quadrangle(28, 29, 30, 31, 0),
     gsSPVertex(&startup_logo[572], 24, 0),
-    mk_gsSP1Quadrangle(0, 1, 2, 3),
-    mk_gsSP1Quadrangle(4, 5, 6, 7),
-    mk_gsSP1Quadrangle(7, 6, 8, 9),
-    mk_gsSP1Quadrangle(9, 8, 10, 11),
-    mk_gsSP1Quadrangle(11, 10, 12, 13),
-    mk_gsSP1Quadrangle(13, 12, 14, 15),
-    mk_gsSP1Quadrangle(16, 17, 1, 0),
-    mk_gsSP1Quadrangle(18, 19, 20, 21),
-    mk_gsSP1Quadrangle(21, 20, 22, 23),
-    mk_gsSP1Quadrangle(23, 22, 17, 16),
+    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP1Quadrangle(7, 6, 8, 9, 0),
+    gsSP1Quadrangle(9, 8, 10, 11, 0),
+    gsSP1Quadrangle(11, 10, 12, 13, 0),
+    gsSP1Quadrangle(13, 12, 14, 15, 0),
+    gsSP1Quadrangle(16, 17, 1, 0, 0),
+    gsSP1Quadrangle(18, 19, 20, 21, 0),
+    gsSP1Quadrangle(21, 20, 22, 23, 0),
+    gsSP1Quadrangle(23, 22, 17, 16, 0),
     gsSPEndDisplayList(),
 
 };
 
 static Gfx startup_logo_dl8[] = {
     gsSPVertex(&startup_logo[596], 32, 0),
-    mk_gsSP1Quadrangle(0, 1, 2, 3),
-    mk_gsSP1Quadrangle(4, 5, 1, 0),
-    mk_gsSP1Quadrangle(3, 2, 6, 7),
-    mk_gsSP1Quadrangle(8, 9, 5, 4),
-    mk_gsSP1Quadrangle(10, 11, 9, 8),
-    mk_gsSP1Quadrangle(12, 13, 11, 10),
-    mk_gsSP1Quadrangle(7, 6, 14, 15),
-    mk_gsSP1Quadrangle(16, 17, 18, 19),
-    mk_gsSP1Quadrangle(20, 21, 17, 16),
-    mk_gsSP1Quadrangle(19, 18, 22, 23),
-    mk_gsSP1Quadrangle(15, 14, 21, 20),
-    mk_gsSP1Quadrangle(24, 25, 13, 12),
-    mk_gsSP1Quadrangle(26, 27, 28, 29),
-    mk_gsSP1Quadrangle(30, 31, 27, 26),
+    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP1Quadrangle(4, 5, 1, 0, 0),
+    gsSP1Quadrangle(3, 2, 6, 7, 0),
+    gsSP1Quadrangle(8, 9, 5, 4, 0),
+    gsSP1Quadrangle(10, 11, 9, 8, 0),
+    gsSP1Quadrangle(12, 13, 11, 10, 0),
+    gsSP1Quadrangle(7, 6, 14, 15, 0),
+    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP1Quadrangle(20, 21, 17, 16, 0),
+    gsSP1Quadrangle(19, 18, 22, 23, 0),
+    gsSP1Quadrangle(15, 14, 21, 20, 0),
+    gsSP1Quadrangle(24, 25, 13, 12, 0),
+    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP1Quadrangle(30, 31, 27, 26, 0),
     gsSPVertex(&startup_logo[628], 32, 0),
-    mk_gsSP1Quadrangle(0, 1, 2, 3),
-    mk_gsSP1Quadrangle(4, 5, 6, 7),
-    mk_gsSP1Quadrangle(8, 9, 5, 4),
-    mk_gsSP1Quadrangle(3, 2, 10, 11),
-    mk_gsSP1Quadrangle(12, 13, 14, 15),
-    mk_gsSP1Quadrangle(11, 10, 13, 12),
-    mk_gsSP1Quadrangle(16, 17, 18, 19),
-    mk_gsSP1Quadrangle(20, 21, 17, 16),
-    mk_gsSP1Quadrangle(19, 18, 22, 23),
-    mk_gsSP1Quadrangle(24, 25, 21, 20),
-    mk_gsSP1Quadrangle(26, 27, 25, 24),
-    mk_gsSP1Quadrangle(28, 29, 27, 26),
-    mk_gsSP1Quadrangle(23, 22, 30, 31),
+    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP1Quadrangle(8, 9, 5, 4, 0),
+    gsSP1Quadrangle(3, 2, 10, 11, 0),
+    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP1Quadrangle(11, 10, 13, 12, 0),
+    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP1Quadrangle(20, 21, 17, 16, 0),
+    gsSP1Quadrangle(19, 18, 22, 23, 0),
+    gsSP1Quadrangle(24, 25, 21, 20, 0),
+    gsSP1Quadrangle(26, 27, 25, 24, 0),
+    gsSP1Quadrangle(28, 29, 27, 26, 0),
+    gsSP1Quadrangle(23, 22, 30, 31, 0),
     gsSPVertex(&startup_logo[660], 28, 0),
-    mk_gsSP1Quadrangle(0, 1, 2, 3),
-    mk_gsSP1Quadrangle(4, 5, 1, 0),
-    mk_gsSP1Quadrangle(3, 2, 6, 7),
-    mk_gsSP1Quadrangle(8, 9, 5, 4),
-    mk_gsSP1Quadrangle(10, 11, 12, 13),
-    mk_gsSP1Quadrangle(14, 15, 16, 17),
-    mk_gsSP1Quadrangle(18, 19, 15, 14),
-    mk_gsSP1Quadrangle(17, 16, 20, 21),
-    mk_gsSP1Quadrangle(7, 6, 19, 18),
-    mk_gsSP1Quadrangle(21, 20, 22, 23),
-    mk_gsSP1Quadrangle(24, 25, 11, 10),
-    mk_gsSP1Quadrangle(26, 27, 25, 24),
-    mk_gsSP1Quadrangle(23, 22, 27, 26),
+    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP1Quadrangle(4, 5, 1, 0, 0),
+    gsSP1Quadrangle(3, 2, 6, 7, 0),
+    gsSP1Quadrangle(8, 9, 5, 4, 0),
+    gsSP1Quadrangle(10, 11, 12, 13, 0),
+    gsSP1Quadrangle(14, 15, 16, 17, 0),
+    gsSP1Quadrangle(18, 19, 15, 14, 0),
+    gsSP1Quadrangle(17, 16, 20, 21, 0),
+    gsSP1Quadrangle(7, 6, 19, 18, 0),
+    gsSP1Quadrangle(21, 20, 22, 23, 0),
+    gsSP1Quadrangle(24, 25, 11, 10, 0),
+    gsSP1Quadrangle(26, 27, 25, 24, 0),
+    gsSP1Quadrangle(23, 22, 27, 26, 0),
     gsSPEndDisplayList(),
 };
 
@@ -2154,70 +2154,70 @@ static Gfx startup_logo_dl9[] = {
     gsSPVertex(&startup_logo2[0], 32, 0),
     gsSP1Triangle(0, 1, 2, 0),
     gsSP1Triangle(0, 3, 1, 0),
-    mk_gsSP1Quadrangle(0, 5, 4, 3),
-    mk_gsSP1Quadrangle(6, 0, 2, 7),
+    gsSP1Quadrangle(0, 5, 4, 3, 0),
+    gsSP1Quadrangle(6, 0, 2, 7, 0),
     gsSP1Triangle(5, 8, 4, 0),
-    mk_gsSP1Quadrangle(5, 10, 9, 8),
-    mk_gsSP1Quadrangle(11, 6, 13, 12),
+    gsSP1Quadrangle(5, 10, 9, 8, 0),
+    gsSP1Quadrangle(11, 6, 13, 12, 0),
     gsSP1Triangle(6, 7, 13, 0),
-    mk_gsSP1Quadrangle(14, 17, 15, 16),
+    gsSP1Quadrangle(14, 17, 15, 16, 0),
     gsSP1Triangle(18, 14, 16, 0),
-    mk_gsSP1Quadrangle(19, 15, 20, 21),
+    gsSP1Quadrangle(19, 15, 20, 21, 0),
     gsSP1Triangle(15, 22, 20, 0),
     gsSP1Triangle(17, 22, 15, 0),
-    mk_gsSP1Quadrangle(11, 23, 24, 16),
+    gsSP1Quadrangle(11, 23, 24, 16, 0),
     gsSP1Triangle(24, 18, 16, 0),
     gsSP1Triangle(11, 12, 25, 0),
     gsSP1Triangle(11, 25, 23, 0),
-    mk_gsSP1Quadrangle(10, 27, 26, 9),
-    mk_gsSP1Quadrangle(28, 29, 21, 20),
+    gsSP1Quadrangle(10, 27, 26, 9, 0),
+    gsSP1Quadrangle(28, 29, 21, 20, 0),
     gsSP1Triangle(30, 31, 26, 0),
     gsSP1Triangle(31, 30, 21, 0),
 
     gsSPVertex(&startup_logo2[32], 29, 0),
-    mk_gsSP1Quadrangle(0, 1, 2, 3),
+    gsSP1Quadrangle(0, 1, 2, 3, 0),
     gsSP1Triangle(4, 5, 6, 0),
-    mk_gsSP1Quadrangle(7, 8, 9, 10),
+    gsSP1Quadrangle(7, 8, 9, 10, 0),
     gsSP1Triangle(11, 12, 13, 0),
-    mk_gsSP1Quadrangle(14, 17, 15, 16),
+    gsSP1Quadrangle(14, 17, 15, 16, 0),
     gsSP1Triangle(18, 19, 20, 0),
-    mk_gsSP1Quadrangle(21, 18, 20, 22),
-    mk_gsSP1Quadrangle(19, 23, 24, 20),
-    mk_gsSP1Quadrangle(23, 25, 26, 24),
-    mk_gsSP1Quadrangle(25, 27, 28, 26),
+    gsSP1Quadrangle(21, 18, 20, 22, 0),
+    gsSP1Quadrangle(19, 23, 24, 20, 0),
+    gsSP1Quadrangle(23, 25, 26, 24, 0),
+    gsSP1Quadrangle(25, 27, 28, 26, 0),
     gsSPVertex(&startup_logo2[61], 30, 0),
-    mk_gsSP1Quadrangle(0, 1, 2, 3),
-    mk_gsSP1Quadrangle(4, 0, 3, 5),
+    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP1Quadrangle(4, 0, 3, 5, 0),
     gsSP1Triangle(6, 7, 8, 0),
-    mk_gsSP1Quadrangle(2, 1, 9, 10),
+    gsSP1Quadrangle(2, 1, 9, 10, 0),
     gsSP1Triangle(4, 11, 12, 0),
     gsSP1Triangle(4, 5, 11, 0),
-    mk_gsSP1Quadrangle(13, 14, 16, 15),
-    mk_gsSP1Quadrangle(10, 9, 17, 18),
-    mk_gsSP1Quadrangle(14, 19, 20, 16),
-    mk_gsSP1Quadrangle(21, 22, 23, 24),
-    mk_gsSP1Quadrangle(25, 6, 26, 27),
+    gsSP1Quadrangle(13, 14, 16, 15, 0),
+    gsSP1Quadrangle(10, 9, 17, 18, 0),
+    gsSP1Quadrangle(14, 19, 20, 16, 0),
+    gsSP1Quadrangle(21, 22, 23, 24, 0),
+    gsSP1Quadrangle(25, 6, 26, 27, 0),
     gsSP1Triangle(28, 7, 29, 0),
     gsSPVertex(&startup_logo2[91], 31, 0),
-    mk_gsSP1Quadrangle(0, 1, 2, 3),
-    mk_gsSP1Quadrangle(4, 0, 3, 5),
-    mk_gsSP1Quadrangle(6, 4, 5, 7),
-    mk_gsSP1Quadrangle(8, 6, 7, 9),
-    mk_gsSP1Quadrangle(10, 11, 13, 12),
-    mk_gsSP1Quadrangle(10, 16, 14, 15),
-    mk_gsSP1Quadrangle(10, 18, 17, 16),
-    mk_gsSP1Quadrangle(13, 20, 19, 12),
-    mk_gsSP1Quadrangle(21, 22, 24, 23),
+    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP1Quadrangle(4, 0, 3, 5, 0),
+    gsSP1Quadrangle(6, 4, 5, 7, 0),
+    gsSP1Quadrangle(8, 6, 7, 9, 0),
+    gsSP1Quadrangle(10, 11, 13, 12, 0),
+    gsSP1Quadrangle(10, 16, 14, 15, 0),
+    gsSP1Quadrangle(10, 18, 17, 16, 0),
+    gsSP1Quadrangle(13, 20, 19, 12, 0),
+    gsSP1Quadrangle(21, 22, 24, 23, 0),
     gsSP1Triangle(21, 25, 26, 0),
     gsSP1Triangle(21, 26, 27, 0),
-    mk_gsSP1Quadrangle(21, 14, 28, 25),
-    mk_gsSP1Quadrangle(24, 29, 30, 23),
+    gsSP1Quadrangle(21, 14, 28, 25, 0),
+    gsSP1Quadrangle(24, 29, 30, 23, 0),
     gsSPVertex(&startup_logo2[122], 32, 0),
-    mk_gsSP1Quadrangle(0, 1, 2, 3),
-    mk_gsSP1Quadrangle(4, 5, 6, 7),
-    mk_gsSP1Quadrangle(8, 3, 9, 10),
+    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP1Quadrangle(8, 3, 9, 10, 0),
     gsSP1Triangle(8, 0, 3, 0),
-    mk_gsSP1Quadrangle(11, 10, 9, 7),
+    gsSP1Quadrangle(11, 10, 9, 7, 0),
     gsSP1Triangle(7, 12, 11, 0),
     gsSP1Triangle(7, 6, 12, 0),
     gsSP1Triangle(13, 14, 15, 0),
@@ -2225,12 +2225,12 @@ static Gfx startup_logo_dl9[] = {
     gsSP1Triangle(19, 17, 16, 0),
     gsSP1Triangle(20, 21, 22, 0),
     gsSP1Triangle(23, 24, 25, 0),
-    mk_gsSP1Quadrangle(26, 23, 25, 27),
+    gsSP1Quadrangle(26, 23, 25, 27, 0),
     gsSP1Triangle(28, 26, 27, 0),
     gsSP1Triangle(29, 30, 31, 0),
     gsSPVertex(&startup_logo2[154], 7, 0),
     gsSP1Triangle(0, 1, 2, 0),
-    mk_gsSP1Quadrangle(3, 4, 2, 1),
+    gsSP1Quadrangle(3, 4, 2, 1, 0),
     gsSP1Triangle(5, 6, 4, 0),
     gsSP1Triangle(3, 5, 4, 0),
     gsSPEndDisplayList(),
@@ -2239,30 +2239,30 @@ static Gfx startup_logo_dl9[] = {
 static Gfx startup_logo_dl10[] = {
 
     gsSPVertex(&startup_logo2[161], 32, 0),
-    mk_gsSP1Quadrangle(0, 1, 2, 3),
-    mk_gsSP1Quadrangle(4, 5, 6, 7),
-    mk_gsSP1Quadrangle(8, 9, 10, 11),
-    mk_gsSP1Quadrangle(12, 13, 14, 15),
-    mk_gsSP1Quadrangle(16, 17, 18, 19),
-    mk_gsSP1Quadrangle(20, 21, 22, 23),
-    mk_gsSP1Quadrangle(11, 24, 25, 8),
-    mk_gsSP1Quadrangle(25, 26, 27, 8),
-    mk_gsSP1Quadrangle(12, 15, 28, 29),
-    mk_gsSP1Quadrangle(15, 30, 31, 28),
+    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP1Quadrangle(11, 24, 25, 8, 0),
+    gsSP1Quadrangle(25, 26, 27, 8, 0),
+    gsSP1Quadrangle(12, 15, 28, 29, 0),
+    gsSP1Quadrangle(15, 30, 31, 28, 0),
     gsSPVertex(&startup_logo2[193], 31, 0),
-    mk_gsSP1Quadrangle(0, 1, 2, 3),
-    mk_gsSP1Quadrangle(4, 5, 6, 7),
-    mk_gsSP1Quadrangle(8, 9, 10, 11),
-    mk_gsSP1Quadrangle(12, 13, 14, 15),
-    mk_gsSP1Quadrangle(16, 17, 18, 19),
-    mk_gsSP1Quadrangle(16, 20, 21, 22),
-    mk_gsSP1Quadrangle(23, 24, 25, 26),
-    mk_gsSP1Quadrangle(27, 28, 29, 30),
+    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP1Quadrangle(16, 20, 21, 22, 0),
+    gsSP1Quadrangle(23, 24, 25, 26, 0),
+    gsSP1Quadrangle(27, 28, 29, 30, 0),
     gsSPVertex(&startup_logo2[224], 16, 0),
-    mk_gsSP1Quadrangle(0, 1, 2, 3),
-    mk_gsSP1Quadrangle(4, 5, 6, 7),
-    mk_gsSP1Quadrangle(8, 9, 10, 11),
-    mk_gsSP1Quadrangle(12, 13, 14, 15),
+    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP1Quadrangle(12, 13, 14, 15, 0),
     gsSPEndDisplayList(),
 
 };
@@ -2272,46 +2272,46 @@ static Gfx startup_logo_dl11[] = {
     gsSPVertex(&startup_logo2[240], 32, 0),
     gsSP1Triangle(0, 1, 2, 0),
     gsSP1Triangle(0, 2, 3, 0),
-    mk_gsSP1Quadrangle(4, 5, 6, 7),
-    mk_gsSP1Quadrangle(7, 6, 8, 9),
-    mk_gsSP1Quadrangle(10, 11, 12, 13),
-    mk_gsSP1Quadrangle(3, 2, 14, 15),
-    mk_gsSP1Quadrangle(2, 16, 17, 14),
-    mk_gsSP1Quadrangle(18, 19, 20, 21),
-    mk_gsSP1Quadrangle(22, 23, 24, 3),
-    mk_gsSP1Quadrangle(22, 3, 15, 25),
+    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP1Quadrangle(7, 6, 8, 9, 0),
+    gsSP1Quadrangle(10, 11, 12, 13, 0),
+    gsSP1Quadrangle(3, 2, 14, 15, 0),
+    gsSP1Quadrangle(2, 16, 17, 14, 0),
+    gsSP1Quadrangle(18, 19, 20, 21, 0),
+    gsSP1Quadrangle(22, 23, 24, 3, 0),
+    gsSP1Quadrangle(22, 3, 15, 25, 0),
     gsSP1Triangle(22, 25, 26, 0),
-    mk_gsSP1Quadrangle(22, 26, 27, 28),
-    mk_gsSP1Quadrangle(28, 30, 29, 22),
+    gsSP1Quadrangle(22, 26, 27, 28, 0),
+    gsSP1Quadrangle(28, 30, 29, 22, 0),
     gsSP1Triangle(28, 27, 31, 0),
     gsSPVertex(&startup_logo2[272], 32, 0),
-    mk_gsSP1Quadrangle(0, 1, 2, 3),
-    mk_gsSP1Quadrangle(3, 5, 4, 0),
+    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP1Quadrangle(3, 5, 4, 0, 0),
     gsSP1Triangle(3, 2, 6, 0),
     gsSP1Triangle(3, 6, 7, 0),
-    mk_gsSP1Quadrangle(3, 7, 8, 9),
+    gsSP1Quadrangle(3, 7, 8, 9, 0),
     gsSP1Triangle(10, 11, 12, 0),
     gsSP1Triangle(10, 12, 13, 0),
-    mk_gsSP1Quadrangle(9, 8, 14, 15),
-    mk_gsSP1Quadrangle(16, 17, 18, 19),
-    mk_gsSP1Quadrangle(16, 19, 20, 21),
-    mk_gsSP1Quadrangle(21, 23, 22, 16),
+    gsSP1Quadrangle(9, 8, 14, 15, 0),
+    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP1Quadrangle(16, 19, 20, 21, 0),
+    gsSP1Quadrangle(21, 23, 22, 16, 0),
     gsSP1Triangle(21, 20, 24, 0),
     gsSP1Triangle(21, 24, 25, 0),
-    mk_gsSP1Quadrangle(21, 25, 26, 27),
-    mk_gsSP1Quadrangle(28, 31, 29, 30),
+    gsSP1Quadrangle(21, 25, 26, 27, 0),
+    gsSP1Quadrangle(28, 31, 29, 30, 0),
     gsSPVertex(&startup_logo2[304], 25, 0),
-    mk_gsSP1Quadrangle(0, 3, 1, 2),
+    gsSP1Quadrangle(0, 3, 1, 2, 0),
     gsSP1Triangle(0, 4, 5, 0),
     gsSP1Triangle(0, 5, 6, 0),
     gsSP1Triangle(0, 6, 7, 0),
     gsSP1Triangle(0, 7, 8, 0),
-    mk_gsSP1Quadrangle(0, 8, 9, 10),
-    mk_gsSP1Quadrangle(0, 10, 11, 12),
-    mk_gsSP1Quadrangle(9, 13, 14, 10),
+    gsSP1Quadrangle(0, 8, 9, 10, 0),
+    gsSP1Quadrangle(0, 10, 11, 12, 0),
+    gsSP1Quadrangle(9, 13, 14, 10, 0),
     gsSP1Triangle(15, 16, 17, 0),
-    mk_gsSP1Quadrangle(18, 19, 20, 21),
-    mk_gsSP1Quadrangle(13, 22, 23, 14),
+    gsSP1Quadrangle(18, 19, 20, 21, 0),
+    gsSP1Quadrangle(13, 22, 23, 14, 0),
     gsSP1Triangle(22, 24, 23, 0),
     gsSPEndDisplayList(),
 
@@ -2320,12 +2320,12 @@ static Gfx startup_logo_dl11[] = {
 static Gfx startup_logo_dl12[] = {
 
     gsSPVertex(&startup_logo2[329], 24, 0),
-    mk_gsSP1Quadrangle(0, 1, 2, 3),
-    mk_gsSP1Quadrangle(4, 5, 6, 7),
-    mk_gsSP1Quadrangle(8, 9, 10, 11),
-    mk_gsSP1Quadrangle(12, 13, 14, 15),
-    mk_gsSP1Quadrangle(16, 17, 18, 19),
-    mk_gsSP1Quadrangle(20, 21, 22, 23),
+    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP1Quadrangle(20, 21, 22, 23, 0),
     gsSPEndDisplayList(),
 
 };
@@ -2333,12 +2333,12 @@ static Gfx startup_logo_dl12[] = {
 static Gfx startup_logo_dl13[] = {
 
     gsSPVertex(&startup_logo2[353], 24, 0),
-    mk_gsSP1Quadrangle(0, 1, 2, 3),
-    mk_gsSP1Quadrangle(4, 5, 6, 7),
-    mk_gsSP1Quadrangle(8, 9, 10, 11),
-    mk_gsSP1Quadrangle(12, 13, 14, 15),
-    mk_gsSP1Quadrangle(16, 17, 18, 19),
-    mk_gsSP1Quadrangle(20, 21, 22, 23),
+    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP1Quadrangle(20, 21, 22, 23, 0),
     gsSPEndDisplayList(),
 
 };
@@ -2346,27 +2346,27 @@ static Gfx startup_logo_dl13[] = {
 static Gfx startup_logo_dl14[] = {
 
     gsSPVertex(&startup_logo2[377], 32, 0),
-    mk_gsSP1Quadrangle(0, 3, 1, 2),
-    mk_gsSP1Quadrangle(4, 5, 6, 7),
-    mk_gsSP1Quadrangle(8, 9, 10, 11),
-    mk_gsSP1Quadrangle(1, 12, 13, 2),
-    mk_gsSP1Quadrangle(3, 15, 14, 1),
-    mk_gsSP1Quadrangle(16, 19, 17, 18),
-    mk_gsSP1Quadrangle(20, 23, 21, 22),
-    mk_gsSP1Quadrangle(24, 27, 25, 26),
-    mk_gsSP1Quadrangle(28, 29, 30, 31),
+    gsSP1Quadrangle(0, 3, 1, 2, 0),
+    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP1Quadrangle(1, 12, 13, 2, 0),
+    gsSP1Quadrangle(3, 15, 14, 1, 0),
+    gsSP1Quadrangle(16, 19, 17, 18, 0),
+    gsSP1Quadrangle(20, 23, 21, 22, 0),
+    gsSP1Quadrangle(24, 27, 25, 26, 0),
+    gsSP1Quadrangle(28, 29, 30, 31, 0),
     gsSPVertex(&startup_logo2[409], 29, 0),
-    mk_gsSP1Quadrangle(0, 3, 1, 2),
-    mk_gsSP1Quadrangle(4, 5, 6, 7),
-    mk_gsSP1Quadrangle(8, 9, 10, 11),
-    mk_gsSP1Quadrangle(12, 13, 4, 14),
+    gsSP1Quadrangle(0, 3, 1, 2, 0),
+    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP1Quadrangle(12, 13, 4, 14, 0),
     gsSP1Triangle(14, 4, 7, 0),
-    mk_gsSP1Quadrangle(15, 16, 17, 18),
+    gsSP1Quadrangle(15, 16, 17, 18, 0),
     gsSP1Triangle(19, 20, 6, 0),
-    mk_gsSP1Quadrangle(21, 22, 23, 24),
-    mk_gsSP1Quadrangle(25, 26, 27, 28),
+    gsSP1Quadrangle(21, 22, 23, 24, 0),
+    gsSP1Quadrangle(25, 26, 27, 28, 0),
     gsSPVertex(&startup_logo2[438], 4, 0),
-    mk_gsSP1Quadrangle(0, 1, 2, 3),
+    gsSP1Quadrangle(0, 1, 2, 3, 0),
     gsSPEndDisplayList(),
 
 };
@@ -2376,46 +2376,46 @@ static Gfx startup_logo_dl15[] = {
     gsSPVertex(&startup_logo2[442], 32, 0),
     gsSP1Triangle(0, 1, 2, 0),
     gsSP1Triangle(0, 2, 3, 0),
-    mk_gsSP1Quadrangle(4, 5, 6, 7),
-    mk_gsSP1Quadrangle(7, 6, 8, 9),
-    mk_gsSP1Quadrangle(10, 11, 12, 13),
-    mk_gsSP1Quadrangle(3, 2, 14, 15),
-    mk_gsSP1Quadrangle(2, 16, 17, 14),
-    mk_gsSP1Quadrangle(18, 19, 20, 21),
-    mk_gsSP1Quadrangle(22, 23, 24, 3),
-    mk_gsSP1Quadrangle(22, 3, 15, 25),
+    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP1Quadrangle(7, 6, 8, 9, 0),
+    gsSP1Quadrangle(10, 11, 12, 13, 0),
+    gsSP1Quadrangle(3, 2, 14, 15, 0),
+    gsSP1Quadrangle(2, 16, 17, 14, 0),
+    gsSP1Quadrangle(18, 19, 20, 21, 0),
+    gsSP1Quadrangle(22, 23, 24, 3, 0),
+    gsSP1Quadrangle(22, 3, 15, 25, 0),
     gsSP1Triangle(22, 25, 26, 0),
-    mk_gsSP1Quadrangle(22, 26, 27, 28),
-    mk_gsSP1Quadrangle(28, 30, 29, 22),
+    gsSP1Quadrangle(22, 26, 27, 28, 0),
+    gsSP1Quadrangle(28, 30, 29, 22, 0),
     gsSP1Triangle(28, 27, 31, 0),
     gsSPVertex(&startup_logo2[474], 32, 0),
-    mk_gsSP1Quadrangle(0, 1, 2, 3),
-    mk_gsSP1Quadrangle(3, 5, 4, 0),
+    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP1Quadrangle(3, 5, 4, 0, 0),
     gsSP1Triangle(3, 2, 6, 0),
     gsSP1Triangle(3, 6, 7, 0),
-    mk_gsSP1Quadrangle(3, 7, 8, 9),
+    gsSP1Quadrangle(3, 7, 8, 9, 0),
     gsSP1Triangle(10, 11, 12, 0),
     gsSP1Triangle(10, 12, 13, 0),
-    mk_gsSP1Quadrangle(9, 8, 14, 15),
-    mk_gsSP1Quadrangle(16, 17, 18, 19),
-    mk_gsSP1Quadrangle(16, 19, 20, 21),
-    mk_gsSP1Quadrangle(21, 23, 22, 16),
+    gsSP1Quadrangle(9, 8, 14, 15, 0),
+    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP1Quadrangle(16, 19, 20, 21, 0),
+    gsSP1Quadrangle(21, 23, 22, 16, 0),
     gsSP1Triangle(21, 20, 24, 0),
     gsSP1Triangle(21, 24, 25, 0),
-    mk_gsSP1Quadrangle(21, 25, 26, 27),
-    mk_gsSP1Quadrangle(28, 31, 29, 30),
+    gsSP1Quadrangle(21, 25, 26, 27, 0),
+    gsSP1Quadrangle(28, 31, 29, 30, 0),
     gsSPVertex(&startup_logo2[506], 25, 0),
-    mk_gsSP1Quadrangle(0, 3, 1, 2),
+    gsSP1Quadrangle(0, 3, 1, 2, 0),
     gsSP1Triangle(0, 4, 5, 0),
     gsSP1Triangle(0, 5, 6, 0),
     gsSP1Triangle(0, 6, 7, 0),
     gsSP1Triangle(0, 7, 8, 0),
-    mk_gsSP1Quadrangle(0, 8, 9, 10),
-    mk_gsSP1Quadrangle(0, 10, 11, 12),
-    mk_gsSP1Quadrangle(9, 13, 14, 10),
+    gsSP1Quadrangle(0, 8, 9, 10, 0),
+    gsSP1Quadrangle(0, 10, 11, 12, 0),
+    gsSP1Quadrangle(9, 13, 14, 10, 0),
     gsSP1Triangle(15, 16, 17, 0),
-    mk_gsSP1Quadrangle(18, 19, 20, 21),
-    mk_gsSP1Quadrangle(13, 22, 23, 14),
+    gsSP1Quadrangle(18, 19, 20, 21, 0),
+    gsSP1Quadrangle(13, 22, 23, 14, 0),
     gsSP1Triangle(22, 24, 23, 0),
     gsSPEndDisplayList(),
 
@@ -2424,48 +2424,48 @@ static Gfx startup_logo_dl15[] = {
 static Gfx startup_logo_dl16[] = {
 
     gsSPVertex(&startup_logo2[531], 32, 0),
-    mk_gsSP1Quadrangle(0, 1, 2, 3),
-    mk_gsSP1Quadrangle(4, 0, 3, 5),
-    mk_gsSP1Quadrangle(1, 6, 7, 2),
-    mk_gsSP1Quadrangle(6, 8, 9, 7),
-    mk_gsSP1Quadrangle(8, 10, 11, 9),
-    mk_gsSP1Quadrangle(10, 12, 13, 11),
-    mk_gsSP1Quadrangle(14, 4, 5, 15),
-    mk_gsSP1Quadrangle(16, 17, 18, 19),
-    mk_gsSP1Quadrangle(16, 20, 21, 17),
-    mk_gsSP1Quadrangle(18, 22, 23, 19),
-    mk_gsSP1Quadrangle(22, 14, 15, 23),
-    mk_gsSP1Quadrangle(20, 24, 25, 21),
-    mk_gsSP1Quadrangle(26, 27, 28, 29),
-    mk_gsSP1Quadrangle(30, 26, 29, 31),
-    mk_gsSP1Quadrangle(12, 30, 31, 13),
+    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP1Quadrangle(4, 0, 3, 5, 0),
+    gsSP1Quadrangle(1, 6, 7, 2, 0),
+    gsSP1Quadrangle(6, 8, 9, 7, 0),
+    gsSP1Quadrangle(8, 10, 11, 9, 0),
+    gsSP1Quadrangle(10, 12, 13, 11, 0),
+    gsSP1Quadrangle(14, 4, 5, 15, 0),
+    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP1Quadrangle(16, 20, 21, 17, 0),
+    gsSP1Quadrangle(18, 22, 23, 19, 0),
+    gsSP1Quadrangle(22, 14, 15, 23, 0),
+    gsSP1Quadrangle(20, 24, 25, 21, 0),
+    gsSP1Quadrangle(26, 27, 28, 29, 0),
+    gsSP1Quadrangle(30, 26, 29, 31, 0),
+    gsSP1Quadrangle(12, 30, 31, 13, 0),
     gsSPVertex(&startup_logo2[563], 32, 0),
-    mk_gsSP1Quadrangle(0, 1, 2, 3),
-    mk_gsSP1Quadrangle(1, 4, 5, 2),
-    mk_gsSP1Quadrangle(4, 6, 7, 5),
-    mk_gsSP1Quadrangle(8, 7, 6, 9),
-    mk_gsSP1Quadrangle(10, 8, 9, 11),
-    mk_gsSP1Quadrangle(12, 13, 14, 15),
-    mk_gsSP1Quadrangle(16, 12, 15, 17),
-    mk_gsSP1Quadrangle(13, 18, 19, 14),
-    mk_gsSP1Quadrangle(20, 21, 22, 23),
-    mk_gsSP1Quadrangle(20, 23, 24, 25),
-    mk_gsSP1Quadrangle(21, 26, 27, 22),
-    mk_gsSP1Quadrangle(26, 28, 29, 27),
-    mk_gsSP1Quadrangle(28, 30, 31, 29),
-    mk_gsSP1Quadrangle(30, 19, 18, 31),
+    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP1Quadrangle(1, 4, 5, 2, 0),
+    gsSP1Quadrangle(4, 6, 7, 5, 0),
+    gsSP1Quadrangle(8, 7, 6, 9, 0),
+    gsSP1Quadrangle(10, 8, 9, 11, 0),
+    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP1Quadrangle(16, 12, 15, 17, 0),
+    gsSP1Quadrangle(13, 18, 19, 14, 0),
+    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP1Quadrangle(20, 23, 24, 25, 0),
+    gsSP1Quadrangle(21, 26, 27, 22, 0),
+    gsSP1Quadrangle(26, 28, 29, 27, 0),
+    gsSP1Quadrangle(28, 30, 31, 29, 0),
+    gsSP1Quadrangle(30, 19, 18, 31, 0),
     gsSPVertex(&startup_logo2[595], 24, 0),
-    mk_gsSP1Quadrangle(0, 1, 2, 3),
-    mk_gsSP1Quadrangle(4, 0, 3, 5),
-    mk_gsSP1Quadrangle(1, 6, 7, 2),
-    mk_gsSP1Quadrangle(8, 9, 10, 11),
-    mk_gsSP1Quadrangle(12, 8, 11, 13),
-    mk_gsSP1Quadrangle(9, 14, 15, 10),
-    mk_gsSP1Quadrangle(14, 16, 17, 15),
-    mk_gsSP1Quadrangle(18, 12, 13, 19),
-    mk_gsSP1Quadrangle(6, 20, 21, 7),
-    mk_gsSP1Quadrangle(20, 22, 23, 21),
-    mk_gsSP1Quadrangle(22, 18, 19, 23),
+    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP1Quadrangle(4, 0, 3, 5, 0),
+    gsSP1Quadrangle(1, 6, 7, 2, 0),
+    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP1Quadrangle(12, 8, 11, 13, 0),
+    gsSP1Quadrangle(9, 14, 15, 10, 0),
+    gsSP1Quadrangle(14, 16, 17, 15, 0),
+    gsSP1Quadrangle(18, 12, 13, 19, 0),
+    gsSP1Quadrangle(6, 20, 21, 7, 0),
+    gsSP1Quadrangle(20, 22, 23, 21, 0),
+    gsSP1Quadrangle(22, 18, 19, 23, 0),
     gsSPEndDisplayList(),
 
 };
@@ -2473,50 +2473,50 @@ static Gfx startup_logo_dl16[] = {
 static Gfx startup_logo_dl17[] = {
 
     gsSPVertex(&startup_logo2[619], 32, 0),
-   mk_gsSP1Quadrangle(0, 1, 2, 3),
+    gsSP1Quadrangle(0, 1, 2, 3, 0),
     gsSP1Triangle(3, 4, 0, 0),
-    mk_gsSP1Quadrangle(5, 6, 2, 1),
-    mk_gsSP1Quadrangle(5, 1, 7, 8),
-    mk_gsSP1Quadrangle(3, 2, 9, 10),
-    mk_gsSP1Quadrangle(11, 14, 12, 13),
-    mk_gsSP1Quadrangle(15, 18, 16, 17),
-    mk_gsSP1Quadrangle(19, 4, 3, 20),
-    mk_gsSP1Quadrangle(21, 24, 22, 23),
-    mk_gsSP1Quadrangle(25, 28, 26, 27),
-    mk_gsSP1Quadrangle(27, 29, 30, 31),
+    gsSP1Quadrangle(5, 6, 2, 1, 0),
+    gsSP1Quadrangle(5, 1, 7, 8, 0),
+    gsSP1Quadrangle(3, 2, 9, 10, 0),
+    gsSP1Quadrangle(11, 14, 12, 13, 0),
+    gsSP1Quadrangle(15, 18, 16, 17, 0),
+    gsSP1Quadrangle(19, 4, 3, 20, 0),
+    gsSP1Quadrangle(21, 24, 22, 23, 0),
+    gsSP1Quadrangle(25, 28, 26, 27, 0),
+    gsSP1Quadrangle(27, 29, 30, 31, 0),
     gsSPVertex(&startup_logo2[651], 30, 0),
-    mk_gsSP1Quadrangle(0, 3, 1, 2),
-    mk_gsSP1Quadrangle(4, 5, 6, 7),
-    mk_gsSP1Quadrangle(7, 6, 8, 9),
-    mk_gsSP1Quadrangle(10, 11, 12, 13),
-    mk_gsSP1Quadrangle(14, 15, 5, 16),
+    gsSP1Quadrangle(0, 3, 1, 2, 0),
+    gsSP1Quadrangle(4, 5, 6, 7, 0),
+    gsSP1Quadrangle(7, 6, 8, 9, 0),
+    gsSP1Quadrangle(10, 11, 12, 13, 0),
+    gsSP1Quadrangle(14, 15, 5, 16, 0),
     gsSP1Triangle(4, 16, 5, 0),
-    mk_gsSP1Quadrangle(17, 20, 18, 19),
-    mk_gsSP1Quadrangle(17, 19, 21, 22),
-    mk_gsSP1Quadrangle(22, 21, 23, 24),
-    mk_gsSP1Quadrangle(20, 26, 25, 18),
-    mk_gsSP1Quadrangle(26, 13, 12, 25),
+    gsSP1Quadrangle(17, 20, 18, 19, 0),
+    gsSP1Quadrangle(17, 19, 21, 22, 0),
+    gsSP1Quadrangle(22, 21, 23, 24, 0),
+    gsSP1Quadrangle(20, 26, 25, 18, 0),
+    gsSP1Quadrangle(26, 13, 12, 25, 0),
     gsSP1Triangle(27, 28, 29, 0),
     gsSPVertex(&startup_logo2[681], 31, 0),
-    mk_gsSP1Quadrangle(0, 1, 2, 3),
+    gsSP1Quadrangle(0, 1, 2, 3, 0),
     gsSP1Triangle(4, 5, 6, 0),
-    mk_gsSP1Quadrangle(7, 8, 9, 10),
-    mk_gsSP1Quadrangle(4, 11, 12, 13),
+    gsSP1Quadrangle(7, 8, 9, 10, 0),
+    gsSP1Quadrangle(4, 11, 12, 13, 0),
     gsSP1Triangle(4, 13, 5, 0),
-    mk_gsSP1Quadrangle(14, 15, 13, 16),
+    gsSP1Quadrangle(14, 15, 13, 16, 0),
     gsSP1Triangle(15, 5, 13, 0),
-    mk_gsSP1Quadrangle(17, 18, 19, 20),
+    gsSP1Quadrangle(17, 18, 19, 20, 0),
     gsSP1Triangle(21, 22, 23, 0),
     gsSP1Triangle(20, 19, 24, 0),
     gsSP1Triangle(16, 25, 26, 0),
-    mk_gsSP1Quadrangle(27, 28, 29, 30),
+    gsSP1Quadrangle(27, 28, 29, 30, 0),
     gsSPVertex(&startup_logo2[712], 20, 0),
-    mk_gsSP1Quadrangle(0, 3, 1, 2),
-    mk_gsSP1Quadrangle(4, 7, 5, 6),
-    mk_gsSP1Quadrangle(8, 9, 10, 11),
-    mk_gsSP1Quadrangle(12, 13, 14, 10),
-    mk_gsSP1Quadrangle(12, 15, 16, 13),
-    mk_gsSP1Quadrangle(15, 17, 18, 16),
+    gsSP1Quadrangle(0, 3, 1, 2, 0),
+    gsSP1Quadrangle(4, 7, 5, 6, 0),
+    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP1Quadrangle(12, 13, 14, 10, 0),
+    gsSP1Quadrangle(12, 15, 16, 13, 0),
+    gsSP1Quadrangle(15, 17, 18, 16, 0),
     gsSP1Triangle(8, 19, 9, 0),
     gsSPEndDisplayList(),
 
@@ -2525,85 +2525,85 @@ static Gfx startup_logo_dl17[] = {
 static Gfx startup_logo_dl18[] = {
 
     gsSPVertex(&startup_logo2[732], 32, 0),
-    mk_gsSP1Quadrangle(0, 1, 2, 3),
-    mk_gsSP1Quadrangle(4, 0, 3, 5),
-    mk_gsSP1Quadrangle(1, 6, 7, 2),
-    mk_gsSP1Quadrangle(8, 4, 5, 9),
-    mk_gsSP1Quadrangle(10, 8, 9, 11),
-    mk_gsSP1Quadrangle(12, 13, 10, 11),
-    mk_gsSP1Quadrangle(6, 14, 15, 7),
-    mk_gsSP1Quadrangle(16, 17, 18, 19),
-    mk_gsSP1Quadrangle(20, 16, 19, 21),
-    mk_gsSP1Quadrangle(22, 18, 17, 23),
-    mk_gsSP1Quadrangle(12, 24, 25, 13),
-    mk_gsSP1Quadrangle(24, 26, 27, 25),
-    mk_gsSP1Quadrangle(14, 20, 21, 15),
-    mk_gsSP1Quadrangle(28, 22, 23, 29),
-    mk_gsSP1Quadrangle(30, 28, 29, 31),
+    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP1Quadrangle(4, 0, 3, 5, 0),
+    gsSP1Quadrangle(1, 6, 7, 2, 0),
+    gsSP1Quadrangle(8, 4, 5, 9, 0),
+    gsSP1Quadrangle(10, 8, 9, 11, 0),
+    gsSP1Quadrangle(12, 13, 10, 11, 0),
+    gsSP1Quadrangle(6, 14, 15, 7, 0),
+    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP1Quadrangle(20, 16, 19, 21, 0),
+    gsSP1Quadrangle(22, 18, 17, 23, 0),
+    gsSP1Quadrangle(12, 24, 25, 13, 0),
+    gsSP1Quadrangle(24, 26, 27, 25, 0),
+    gsSP1Quadrangle(14, 20, 21, 15, 0),
+    gsSP1Quadrangle(28, 22, 23, 29, 0),
+    gsSP1Quadrangle(30, 28, 29, 31, 0),
     gsSPVertex(&startup_logo2[764], 32, 0),
-    mk_gsSP1Quadrangle(0, 1, 2, 3),
-    mk_gsSP1Quadrangle(2, 4, 5, 3),
-    mk_gsSP1Quadrangle(4, 6, 7, 5),
-    mk_gsSP1Quadrangle(8, 9, 10, 11),
-    mk_gsSP1Quadrangle(12, 8, 11, 13),
-    mk_gsSP1Quadrangle(14, 12, 13, 15),
-    mk_gsSP1Quadrangle(6, 14, 15, 7),
-    mk_gsSP1Quadrangle(16, 17, 18, 19),
-    mk_gsSP1Quadrangle(20, 16, 19, 21),
-    mk_gsSP1Quadrangle(17, 22, 23, 18),
-    mk_gsSP1Quadrangle(22, 24, 25, 23),
-    mk_gsSP1Quadrangle(24, 26, 27, 25),
-    mk_gsSP1Quadrangle(28, 27, 26, 29),
-    mk_gsSP1Quadrangle(30, 20, 21, 31),
+    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP1Quadrangle(2, 4, 5, 3, 0),
+    gsSP1Quadrangle(4, 6, 7, 5, 0),
+    gsSP1Quadrangle(8, 9, 10, 11, 0),
+    gsSP1Quadrangle(12, 8, 11, 13, 0),
+    gsSP1Quadrangle(14, 12, 13, 15, 0),
+    gsSP1Quadrangle(6, 14, 15, 7, 0),
+    gsSP1Quadrangle(16, 17, 18, 19, 0),
+    gsSP1Quadrangle(20, 16, 19, 21, 0),
+    gsSP1Quadrangle(17, 22, 23, 18, 0),
+    gsSP1Quadrangle(22, 24, 25, 23, 0),
+    gsSP1Quadrangle(24, 26, 27, 25, 0),
+    gsSP1Quadrangle(28, 27, 26, 29, 0),
+    gsSP1Quadrangle(30, 20, 21, 31, 0),
     gsSPVertex(&startup_logo2[796], 32, 0),
-    mk_gsSP1Quadrangle(0, 1, 2, 3),
-    mk_gsSP1Quadrangle(2, 4, 5, 3),
-    mk_gsSP1Quadrangle(4, 6, 7, 5),
-    mk_gsSP1Quadrangle(6, 8, 9, 7),
-    mk_gsSP1Quadrangle(10, 9, 8, 11),
-    mk_gsSP1Quadrangle(12, 13, 14, 15),
-    mk_gsSP1Quadrangle(12, 16, 17, 13),
-    mk_gsSP1Quadrangle(14, 18, 19, 15),
-    mk_gsSP1Quadrangle(20, 21, 22, 23),
-    mk_gsSP1Quadrangle(24, 20, 23, 25),
-    mk_gsSP1Quadrangle(21, 10, 11, 22),
-    mk_gsSP1Quadrangle(26, 24, 25, 27),
-    mk_gsSP1Quadrangle(16, 28, 29, 17),
-    mk_gsSP1Quadrangle(28, 30, 31, 29),
-    mk_gsSP1Quadrangle(30, 26, 27, 31),
+    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP1Quadrangle(2, 4, 5, 3, 0),
+    gsSP1Quadrangle(4, 6, 7, 5, 0),
+    gsSP1Quadrangle(6, 8, 9, 7, 0),
+    gsSP1Quadrangle(10, 9, 8, 11, 0),
+    gsSP1Quadrangle(12, 13, 14, 15, 0),
+    gsSP1Quadrangle(12, 16, 17, 13, 0),
+    gsSP1Quadrangle(14, 18, 19, 15, 0),
+    gsSP1Quadrangle(20, 21, 22, 23, 0),
+    gsSP1Quadrangle(24, 20, 23, 25, 0),
+    gsSP1Quadrangle(21, 10, 11, 22, 0),
+    gsSP1Quadrangle(26, 24, 25, 27, 0),
+    gsSP1Quadrangle(16, 28, 29, 17, 0),
+    gsSP1Quadrangle(28, 30, 31, 29, 0),
+    gsSP1Quadrangle(30, 26, 27, 31, 0),
     gsSPEndDisplayList(),
 
 };
 
 static Gfx startup_logo_dl19[] = {
     gsSPVertex(&startup_logo2[828], 32, 0),
-    mk_gsSP1Quadrangle(0, 1, 2, 3),
+    gsSP1Quadrangle(0, 1, 2, 3, 0),
     gsSP1Triangle(0, 3, 4, 0),
-    mk_gsSP1Quadrangle(5, 6, 0, 7),
-    mk_gsSP1Quadrangle(0, 9, 8, 1),
+    gsSP1Quadrangle(5, 6, 0, 7, 0),
+    gsSP1Quadrangle(0, 9, 8, 1, 0),
     gsSP1Triangle(0, 4, 10, 0),
     gsSP1Triangle(5, 7, 11, 0),
     gsSP1Triangle(0, 10, 12, 0),
     gsSP1Triangle(0, 12, 13, 0),
     gsSP1Triangle(0, 14, 7, 0),
     gsSP1Triangle(0, 13, 14, 0),
-    mk_gsSP1Quadrangle(1, 15, 16, 2),
+    gsSP1Quadrangle(1, 15, 16, 2, 0),
     gsSP1Triangle(2, 17, 18, 0),
     gsSP1Triangle(2, 18, 3, 0),
-    mk_gsSP1Quadrangle(2, 19, 20, 17),
-    mk_gsSP1Quadrangle(21, 17, 20, 22),
+    gsSP1Quadrangle(2, 19, 20, 17, 0),
+    gsSP1Quadrangle(21, 17, 20, 22, 0),
     gsSP1Triangle(23, 21, 22, 0),
     gsSP1Triangle(24, 23, 22, 0),
-    mk_gsSP1Quadrangle(22, 27, 25, 26),
+    gsSP1Quadrangle(22, 27, 25, 26, 0),
     gsSP1Triangle(22, 28, 27, 0),
     gsSP1Triangle(29, 24, 22, 0),
     gsSP1Triangle(30, 29, 22, 0),
     gsSP1Triangle(31, 30, 22, 0),
     gsSP1Triangle(31, 22, 26, 0),
     gsSPVertex(&startup_logo2[860], 32, 0),
-    mk_gsSP1Quadrangle(0, 1, 2, 3),
-    mk_gsSP1Quadrangle(3, 4, 5, 6),
-    mk_gsSP1Quadrangle(7, 8, 3, 6),
+    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP1Quadrangle(3, 4, 5, 6, 0),
+    gsSP1Quadrangle(7, 8, 3, 6, 0),
     gsSP1Triangle(8, 9, 3, 0),
     gsSP1Triangle(9, 10, 3, 0),
     gsSP1Triangle(6, 11, 12, 0),
@@ -2614,36 +2614,36 @@ static Gfx startup_logo_dl19[] = {
     gsSP1Triangle(6, 12, 16, 0),
     gsSP1Triangle(17, 18, 19, 0),
     gsSP1Triangle(20, 21, 22, 0),
-    mk_gsSP1Quadrangle(20, 23, 24, 25),
-    mk_gsSP1Quadrangle(26, 28, 27, 20),
-    mk_gsSP1Quadrangle(29, 30, 26, 20),
+    gsSP1Quadrangle(20, 23, 24, 25, 0),
+    gsSP1Quadrangle(26, 28, 27, 20, 0),
+    gsSP1Quadrangle(29, 30, 26, 20, 0),
     gsSP1Triangle(20, 25, 31, 0),
     gsSPVertex(&startup_logo2[892], 30, 0),
     gsSP1Triangle(0, 1, 2, 0),
     gsSP1Triangle(3, 4, 2, 0),
     gsSP1Triangle(4, 0, 2, 0),
     gsSP1Triangle(2, 5, 6, 0),
-    mk_gsSP1Quadrangle(7, 8, 9, 10),
-    mk_gsSP1Quadrangle(10, 11, 12, 13),
+    gsSP1Quadrangle(7, 8, 9, 10, 0),
+    gsSP1Quadrangle(10, 11, 12, 13, 0),
     gsSP1Triangle(10, 14, 15, 0),
     gsSP1Triangle(10, 13, 14, 0),
-    mk_gsSP1Quadrangle(10, 16, 17, 11),
+    gsSP1Quadrangle(10, 16, 17, 11, 0),
     gsSP1Triangle(10, 15, 18, 0),
     gsSP1Triangle(10, 18, 19, 0),
     gsSP1Triangle(10, 19, 20, 0),
     gsSP1Triangle(10, 21, 22, 0),
     gsSP1Triangle(10, 20, 21, 0),
-    mk_gsSP1Quadrangle(11, 23, 24, 12),
+    gsSP1Quadrangle(11, 23, 24, 12, 0),
     gsSP1Triangle(12, 25, 13, 0),
-    mk_gsSP1Quadrangle(26, 25, 12, 27),
+    gsSP1Quadrangle(26, 25, 12, 27, 0),
     gsSP1Triangle(28, 26, 27, 0),
     gsSP1Triangle(29, 28, 27, 0),
     gsSPVertex(&startup_logo2[922], 19, 0),
-    mk_gsSP1Quadrangle(0, 3, 1, 2),
+    gsSP1Quadrangle(0, 3, 1, 2, 0),
     gsSP1Triangle(0, 4, 3, 0),
     gsSP1Triangle(5, 6, 0, 0),
     gsSP1Triangle(7, 5, 0, 0),
-    mk_gsSP1Quadrangle(1, 8, 9, 2),
+    gsSP1Quadrangle(1, 8, 9, 2, 0),
     gsSP1Triangle(10, 11, 2, 0),
     gsSP1Triangle(11, 12, 2, 0),
     gsSP1Triangle(12, 0, 2, 0),
@@ -2657,88 +2657,88 @@ static Gfx startup_logo_dl19[] = {
 static Gfx startup_logo_dl20[] = {
 
     gsSPVertex(&startup_logo2[941], 29, 0),
-    mk_gsSP1Quadrangle(0, 1, 2, 3),
+    gsSP1Quadrangle(0, 1, 2, 3, 0),
     gsSP1Triangle(4, 0, 3, 0),
     gsSP1Triangle(2, 1, 5, 0),
-    mk_gsSP1Quadrangle(2, 5, 6, 7),
-    mk_gsSP1Quadrangle(7, 8, 9, 2),
+    gsSP1Quadrangle(2, 5, 6, 7, 0),
+    gsSP1Quadrangle(7, 8, 9, 2, 0),
     gsSP1Triangle(8, 10, 9, 0),
-    mk_gsSP1Quadrangle(7, 12, 11, 8),
-    mk_gsSP1Quadrangle(3, 13, 14, 15),
+    gsSP1Quadrangle(7, 12, 11, 8, 0),
+    gsSP1Quadrangle(3, 13, 14, 15, 0),
     gsSP1Triangle(15, 16, 3, 0),
     gsSP1Triangle(16, 4, 3, 0),
-    mk_gsSP1Quadrangle(14, 17, 18, 19),
+    gsSP1Quadrangle(14, 17, 18, 19, 0),
     gsSP1Triangle(20, 21, 14, 0),
-    mk_gsSP1Quadrangle(22, 20, 14, 19),
+    gsSP1Quadrangle(22, 20, 14, 19, 0),
     gsSP1Triangle(23, 15, 14, 0),
     gsSP1Triangle(21, 24, 14, 0),
     gsSP1Triangle(24, 23, 14, 0),
-    mk_gsSP1Quadrangle(25, 26, 27, 28),
+    gsSP1Quadrangle(25, 26, 27, 28, 0),
     gsSPVertex(&startup_logo2[970], 32, 0),
-    mk_gsSP1Quadrangle(0, 1, 2, 3),
-    mk_gsSP1Quadrangle(4, 5, 6, 7),
+    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP1Quadrangle(4, 5, 6, 7, 0),
     gsSP1Triangle(8, 9, 10, 0),
-    mk_gsSP1Quadrangle(11, 12, 13, 14),
-    mk_gsSP1Quadrangle(15, 16, 8, 10),
-    mk_gsSP1Quadrangle(17, 18, 19, 20),
-    mk_gsSP1Quadrangle(10, 21, 22, 23),
+    gsSP1Quadrangle(11, 12, 13, 14, 0),
+    gsSP1Quadrangle(15, 16, 8, 10, 0),
+    gsSP1Quadrangle(17, 18, 19, 20, 0),
+    gsSP1Quadrangle(10, 21, 22, 23, 0),
     gsSP1Triangle(10, 24, 25, 0),
     gsSP1Triangle(10, 25, 26, 0),
     gsSP1Triangle(10, 27, 15, 0),
     gsSP1Triangle(10, 26, 27, 0),
-    mk_gsSP1Quadrangle(10, 23, 28, 24),
+    gsSP1Quadrangle(10, 23, 28, 24, 0),
     gsSP1Triangle(29, 30, 31, 0),
     gsSPVertex(&startup_logo2[1002], 29, 0),
     gsSP1Triangle(0, 1, 2, 0),
-    mk_gsSP1Quadrangle(3, 4, 5, 0),
+    gsSP1Quadrangle(3, 4, 5, 0, 0),
     gsSP1Triangle(0, 6, 7, 0),
     gsSP1Triangle(8, 9, 10, 0),
     gsSP1Triangle(0, 2, 11, 0),
     gsSP1Triangle(0, 12, 13, 0),
     gsSP1Triangle(0, 11, 12, 0),
-    mk_gsSP1Quadrangle(14, 15, 16, 17),
+    gsSP1Quadrangle(14, 15, 16, 17, 0),
     gsSP1Triangle(18, 19, 20, 0),
     gsSP1Triangle(21, 22, 3, 0),
     gsSP1Triangle(23, 24, 25, 0),
     gsSP1Triangle(26, 27, 28, 0),
     gsSPVertex(&startup_logo2[1031], 32, 0),
-    mk_gsSP1Quadrangle(0, 1, 2, 3),
-    mk_gsSP1Quadrangle(4, 0, 3, 5),
+    gsSP1Quadrangle(0, 1, 2, 3, 0),
+    gsSP1Quadrangle(4, 0, 3, 5, 0),
     gsSP1Triangle(3, 6, 7, 0),
     gsSP1Triangle(3, 7, 8, 0),
     gsSP1Triangle(3, 8, 5, 0),
     gsSP1Triangle(3, 9, 6, 0),
     gsSP1Triangle(4, 5, 10, 0),
     gsSP1Triangle(11, 12, 13, 0),
-    mk_gsSP1Quadrangle(11, 13, 4, 10),
-    mk_gsSP1Quadrangle(14, 15, 16, 11),
+    gsSP1Quadrangle(11, 13, 4, 10, 0),
+    gsSP1Quadrangle(14, 15, 16, 11, 0),
     gsSP1Triangle(11, 17, 18, 0),
-    mk_gsSP1Quadrangle(19, 11, 18, 20),
+    gsSP1Quadrangle(19, 11, 18, 20, 0),
     gsSP1Triangle(11, 21, 17, 0),
-    mk_gsSP1Quadrangle(19, 22, 14, 11),
+    gsSP1Quadrangle(19, 22, 14, 11, 0),
     gsSP1Triangle(11, 23, 21, 0),
     gsSP1Triangle(11, 24, 23, 0),
     gsSP1Triangle(6, 25, 7, 0),
-    mk_gsSP1Quadrangle(26, 25, 6, 27),
+    gsSP1Quadrangle(26, 25, 6, 27, 0),
     gsSP1Triangle(28, 29, 30, 0),
     gsSP1Triangle(31, 26, 27, 0),
     gsSPVertex(&startup_logo2[1063], 30, 0),
     gsSP1Triangle(0, 1, 2, 0),
-    mk_gsSP1Quadrangle(3, 4, 5, 6),
-    mk_gsSP1Quadrangle(2, 7, 8, 4),
+    gsSP1Quadrangle(3, 4, 5, 6, 0),
+    gsSP1Quadrangle(2, 7, 8, 4, 0),
     gsSP1Triangle(9, 10, 2, 0),
     gsSP1Triangle(10, 0, 2, 0),
     gsSP1Triangle(11, 9, 2, 0),
-    mk_gsSP1Quadrangle(12, 11, 2, 6),
+    gsSP1Quadrangle(12, 11, 2, 6, 0),
     gsSP1Triangle(6, 13, 14, 0),
     gsSP1Triangle(15, 16, 17, 0),
-    mk_gsSP1Quadrangle(5, 18, 19, 6),
+    gsSP1Quadrangle(5, 18, 19, 6, 0),
     gsSP1Triangle(20, 21, 6, 0),
     gsSP1Triangle(22, 20, 6, 0),
     gsSP1Triangle(6, 23, 24, 0),
     gsSP1Triangle(24, 22, 6, 0),
     gsSP1Triangle(21, 12, 6, 0),
-    mk_gsSP1Quadrangle(4, 25, 26, 5),
+    gsSP1Quadrangle(4, 25, 26, 5, 0),
     gsSP1Triangle(27, 28, 29, 0),
     gsSPEndDisplayList(),