Several demo matches (#1165)

include/JSystem/J3DGraphBase/J3DMatBlock.h

@@ -9,8 +9,18 @@
 
 struct J3DGXColorS10 {
     J3DGXColorS10() {}
-    J3DGXColorS10(GXColorS10& other) { mColor = other; }
-    J3DGXColorS10(J3DGXColorS10& other) { mColor = other.mColor; }
+    J3DGXColorS10(GXColorS10& other) {
+        mColor.r = other.r;
+        mColor.g = other.g;
+        mColor.b = other.b;
+        mColor.a = other.a;
+    }
+    J3DGXColorS10(J3DGXColorS10& other) {
+        mColor.r = other.mColor.r;
+        mColor.g = other.mColor.g;
+        mColor.b = other.mColor.b;
+        mColor.a = other.mColor.a;
+    }
     J3DGXColorS10& operator=(const J3DGXColorS10& other) {
         mColor = other.mColor;
         return *this;
@@ -25,8 +35,18 @@ struct J3DGXColorS10 {
 
 struct J3DGXColor {
     J3DGXColor() {}
-    J3DGXColor(GXColor& other) { mColor = other; }
-    J3DGXColor(J3DGXColor& other) { mColor = other.mColor; }
+    J3DGXColor(GXColor& other) {
+        mColor.r = other.r;
+        mColor.g = other.g;
+        mColor.b = other.b;
+        mColor.a = other.a;
+    }
+    J3DGXColor(J3DGXColor& other) {
+        mColor.r = other.mColor.r;
+        mColor.g = other.mColor.g;
+        mColor.b = other.mColor.b;
+        mColor.a = other.mColor.a;
+    }
     J3DGXColor& operator=(const J3DGXColor& other) {
         mColor = other.mColor;
         return *this;

include/JSystem/J3DGraphBase/J3DSys.h

@@ -12,9 +12,10 @@ enum J3DError {
     J3DErrType_OutOfMemory = 4,
 };
 
-enum J3DSysDrawBuffer {
-    /* 0x0 */ OPA_BUFFER,
-    /* 0x1 */ XLU_BUFFER
+enum J3DSysDrawBuf {
+    /* 0x0 */ J3DSysDrawBuf_Opa,
+    /* 0x1 */ J3DSysDrawBuf_Xlu,
+    /* 0x2 */ J3DSysDrawBuf_MAX,
 };
 
 class J3DMtxCalc;