diff --git a/desmume/src/gfx3d.cpp b/desmume/src/gfx3d.cpp
index e98a5782d..af4ff8426 100644
--- a/desmume/src/gfx3d.cpp
+++ b/desmume/src/gfx3d.cpp
@@ -1625,6 +1625,7 @@ void gfx3d_UpdateToonTable(u8 offset, u16 val)
 
 void gfx3d_UpdateToonTable(u8 offset, u32 val)
 {
+	//C.O.P. sets toon table via this method
 	gfx3d.u16ToonTable[offset] = val & 0xFFFF;
 	gfx3d.u16ToonTable[offset+1] = val >> 16;
 }
diff --git a/desmume/src/gfx3d.h b/desmume/src/gfx3d.h
index c2932fce6..e1ac18dbb 100644
--- a/desmume/src/gfx3d.h
+++ b/desmume/src/gfx3d.h
@@ -312,6 +312,8 @@ struct GFX3D
 		, frameCtr(0)
 		, frameCtrRaw(0)
 	{
+		for(int i=0;i<ARRAY_SIZE(u16ToonTable);i++)
+			u16ToonTable[i] = 0;
 	}
 	BOOL enableTexturing, enableAlphaTest, enableAlphaBlending, 
 		enableAntialiasing, enableEdgeMarking, enableClearImage, enableFog, enableFogAlphaOnly;