diff --git a/src/game/bondview.c b/src/game/bondview.c
index 2ced8b44f..6c794a2c5 100644
--- a/src/game/bondview.c
+++ b/src/game/bondview.c
@@ -211,7 +211,7 @@ Gfx *bviewPrepareStaticRgba16(Gfx *gdl, u32 colour, u32 alpha)
 	gDPSetTexturePersp(gdl++, G_TP_NONE);
 	gDPSetColorDither(gdl++, G_CD_DISABLE);
 	gDPSetAlphaDither(gdl++, G_AD_NOISE);
-	gDPSetRenderMode(gdl++, G_RM_CLD_SURF, G_RM_NOOP2);
+	gDPSetRenderMode(gdl++, G_RM_CLD_SURF, G_RM_CLD_SURF2);
 
 	return gdl;
 }
@@ -245,7 +245,7 @@ Gfx *bviewPrepareStaticI8(Gfx *gdl, u32 colour, u32 alpha)
 	gDPSetTexturePersp(gdl++, G_TP_NONE);
 	gDPSetColorDither(gdl++, G_CD_DISABLE);
 	gDPSetAlphaDither(gdl++, G_AD_NOISE);
-	gDPSetRenderMode(gdl++, G_RM_CLD_SURF, G_RM_NOOP2);
+	gDPSetRenderMode(gdl++, G_RM_CLD_SURF, G_RM_CLD_SURF2);
 
 	return gdl;
 }
diff --git a/src/game/sparks.c b/src/game/sparks.c
index 56c8c842b..993232b1e 100644
--- a/src/game/sparks.c
+++ b/src/game/sparks.c
@@ -335,7 +335,7 @@ Gfx *sparksRender(Gfx *gdl)
 
 		gDPSetCycleType(gdl++, G_CYC_1CYCLE);
 		gDPSetColorDither(gdl++, G_CD_DISABLE);
-		gDPSetRenderMode(gdl++, G_RM_AA_ZB_XLU_SURF, G_RM_NOOP2);
+		gDPSetRenderMode(gdl++, G_RM_AA_ZB_XLU_SURF, G_RM_AA_ZB_XLU_SURF2);
 		gDPSetAlphaCompare(gdl++, G_AC_NONE);
 		gDPSetTextureLOD(gdl++, G_TL_TILE);
 		gDPSetTextureConvert(gdl++, G_TC_FILT);
diff --git a/src/game/weather.c b/src/game/weather.c
index 917e4d436..800d1d090 100644
--- a/src/game/weather.c
+++ b/src/game/weather.c
@@ -823,7 +823,7 @@ Gfx *weatherRenderRain(Gfx *gdl, struct weatherdata *weather, s32 arg2)
 
 	gDPSetCycleType(gdl++, G_CYC_1CYCLE);
 	gDPSetColorDither(gdl++, G_CD_DISABLE);
-	gDPSetRenderMode(gdl++, G_RM_AA_ZB_XLU_SURF, G_RM_NOOP2);
+	gDPSetRenderMode(gdl++, G_RM_AA_ZB_XLU_SURF, G_RM_AA_ZB_XLU_SURF2);
 	gDPSetAlphaCompare(gdl++, G_AC_NONE);
 	gDPSetTextureLOD(gdl++, G_TL_TILE);
 	gDPSetTextureConvert(gdl++, G_TC_FILT);
@@ -2902,7 +2902,7 @@ Gfx *weatherRenderSnow(Gfx *gdl, struct weatherdata *weather, s32 arg2)
 
 	gDPSetCycleType(gdl++, G_CYC_1CYCLE);
 	gDPSetColorDither(gdl++, G_CD_DISABLE);
-	gDPSetRenderMode(gdl++, G_RM_AA_ZB_XLU_SURF, G_RM_NOOP2);
+	gDPSetRenderMode(gdl++, G_RM_AA_ZB_XLU_SURF, G_RM_AA_ZB_XLU_SURF2);
 	gDPSetAlphaCompare(gdl++, G_AC_NONE);
 	gDPSetTextureLOD(gdl++, G_TL_TILE);
 	gDPSetTextureConvert(gdl++, G_TC_FILT);