diff --git a/dlist.asm b/dlist.asm
index a28508f..713f689 100644
--- a/dlist.asm
+++ b/dlist.asm
@@ -130,7 +130,7 @@ WriteDList:
     gPipeSync()
     gSetSegment0(0) // set to 0 so that 00-prefixed addresses are absolute.
     gTextureOff()
-    gSetCombine(15,15,31,4,7,7,7,4, 15,15,31,4,7,7,7,7)
+    gSetCombine(15,15,31,4,7,7,7,4, 15,15,31,4,7,7,7,4)
     gSetScissor(0, 0, 0, WIDTH, HEIGHT) // TODO: use mode enum
     gSetBlendColor(0,0,0,0)
     gClipRatio(2)
@@ -173,7 +173,7 @@ if HIRES {
     gMatrix(view_mat1, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION)
 
     gPipeSync()
-    gSetCombine(15,15,31,4,7,7,7,4, 15,15,31,4,7,7,7,7)
+    gSetCombine(15,15,31,4,7,7,7,4, 15,15,31,4,7,7,7,4)
     gSetOtherMode(G_PM_NPRIMITIVE | G_CYC_1CYCLE | G_TP_NONE | G_TD_CLAMP | G_TL_TILE | G_TT_NONE | G_TF_AVERAGE | G_TC_FILT | G_CK_NONE | G_CD_MAGICSQ | G_AD_PATTERN, G_AC_NONE | G_ZS_PIXEL | Z_CMP | Z_UPD)
     // CULL_FRONT is dying on N64?
     gGeometryMode(0, G_ZBUFFER | G_SHADE | G_CULL_FRONT | G_SHADING_SMOOTH)
diff --git a/inc/F3DEX2.inc b/inc/F3DEX2.inc
index 4f16812..6943c4d 100644
--- a/inc/F3DEX2.inc
+++ b/inc/F3DEX2.inc
@@ -726,6 +726,6 @@ macro gDisasmCombine(variable upper, variable lower) {
     variable Ad0((lower >> 9) & 0x7)
     variable d1((lower >> 6) & 0x7)
     variable Ab1((lower >> 3) & 0x7)
-    variable Ad1((lower >> 3) & 0x7)
+    variable Ad1(lower & 0x7)
     print "gSetCombine(",a0,",",b0,",",c0,",",d0,",",Aa0,",",Ab0,",",Ac0,",",Ad0,", ",a1,",",b1,",",c1,",",d1,",",Aa1,",",Ab1,",",Ac1,",",Ad1,")\n"
 }