Link J2DWindowEX (#2946)

* Add debug for J2DWindowEx, link GCN version

* locking non-const copy ctor behind GCN check

* fix typo for define

* fix another define typo

* update bugged ctor and leave a comment

2 files changed, 27 insertions, 3 deletions

diff --git a/include/JSystem/J2DGraph/J2DAnimation.h b/include/JSystem/J2DGraph/J2DAnimation.h
index 380e9c93de..5d2014cd61 100644
--- a/include/JSystem/J2DGraph/J2DAnimation.h
+++ b/include/JSystem/J2DGraph/J2DAnimation.h
@@ -63,13 +63,19 @@ public:
     }
     virtual ~J2DAnmVtxColor() {}
     virtual void getColor(u8, u16, _GXColor*) const {}
-    u16 getAnmTableNum(u8 param_0) const { return mAnmTableNum[param_0]; }
+    u16 getAnmTableNum(u8 param_0) const {
+        J3D_PANIC(342, param_0 < 2, "Error : range over.");
+        return mAnmTableNum[param_0];
+    }
     J3DAnmVtxColorIndexData* getAnmVtxColorIndexData(u8 param_1, u16 param_2) const {
         J3D_PANIC(344, param_1 < 2, "Error : range over.");
         J3D_PANIC(345, param_2 < mAnmTableNum[param_1], "Error : range over.");
         return &mVtxColorIndexData[param_1][param_2];
     }
-    u16* getVtxColorIndexPointer(u8 param_0) const { return mVtxColorIndexPointer[param_0]; }
+    u16* getVtxColorIndexPointer(u8 param_0) const {
+        J3D_PANIC(351, param_0 < 2, "Error : range over.");
+        return mVtxColorIndexPointer[param_0];
+    }
 
     /* 0x10 */ u16 mAnmTableNum[2];
     /* 0x14 */ J3DAnmVtxColorIndexData* mVtxColorIndexData[2];
diff --git a/include/JSystem/J2DGraph/J2DMatBlock.h b/include/JSystem/J2DGraph/J2DMatBlock.h
index c13fa2f332..90321c9196 100644
--- a/include/JSystem/J2DGraph/J2DMatBlock.h
+++ b/include/JSystem/J2DGraph/J2DMatBlock.h
@@ -19,19 +19,37 @@ struct ResTLUT;
  */
 struct J2DGXColorS10 : public GXColorS10 {
     J2DGXColorS10() {}
+    
+#if PLATFORM_GCN
+    J2DGXColorS10(J2DGXColorS10& other) {
+        r = other.r;
+        g = other.g;
+        b = other.b;
+        a = other.a;
+    }
+    
+    J2DGXColorS10(GXColorS10& other) {
+        r = other.r;
+        g = other.g;
+        b = other.b;
+        a = other.a;
+    }
+#else
     J2DGXColorS10(const J2DGXColorS10& other) {
         r = other.r;
         g = other.g;
         b = other.b;
         a = other.a;
     }
+    
     J2DGXColorS10(const GXColorS10& other) {
         r = other.r;
         g = other.g;
         b = other.b;
         a = other.a;
     }
-
+#endif
+    
     J2DGXColorS10& operator=(const GXColorS10& other) {
         r = other.r;
         g = other.g;