Misc cleanup

include/JSystem/J3DGraphBase/J3DMatBlock.h

@@ -625,8 +625,6 @@ struct J3DBlend : public J3DBlendInfo {
     // void operator==(J3DBlend&) {}
 };
 
-extern const J3DFogInfo j3dDefaultFogInfo;
-
 struct J3DFog : public J3DFogInfo {
     // J3DFog() { *getFogInfo() = j3dDefaultFogInfo; } // Produces the wrong codegen for mDoExt_backupMatBlock_c's constructor
     J3DFog() { J3DFogInfo::operator=(j3dDefaultFogInfo); }
@@ -641,17 +639,6 @@ struct J3DFog : public J3DFogInfo {
     void setType(u8 type) { mType = type; }
 };
 
-struct J3DAlphaCompInfo {
-    /* 0x0 */ u8 mComp0;
-    /* 0x1 */ u8 mRef0;
-    /* 0x2 */ u8 mOp;
-    /* 0x3 */ u8 mComp1;
-    /* 0x4 */ u8 mRef1;
-    /* 0x5 */ u8 field_0x5;
-    /* 0x6 */ u8 field_0x6;
-    /* 0x7 */ u8 field_0x7;
-};
-
 inline u16 calcAlphaCmpID(u8 comp0, u8 op, u8 comp1) {
     return (comp0 << 5) + (op << 3) + (comp1);
 }

include/JSystem/J3DGraphBase/J3DStruct.h

@@ -240,4 +240,15 @@ struct J3DZModeInfo {
     /* 0x03 */ u8 pad;
 };
 
+struct J3DAlphaCompInfo {
+    /* 0x0 */ u8 mComp0;
+    /* 0x1 */ u8 mRef0;
+    /* 0x2 */ u8 mOp;
+    /* 0x3 */ u8 mComp1;
+    /* 0x4 */ u8 mRef1;
+    /* 0x5 */ u8 field_0x5;
+    /* 0x6 */ u8 field_0x6;
+    /* 0x7 */ u8 field_0x7;
+};
+
 #endif /* J3DSTRUCT_H */

include/JSystem/JGeometry.h

@@ -369,9 +369,12 @@ template<> struct TBox<TVec2<f32> > {
 };
 
 template <typename T>
-struct TBox2 : TBox<TVec2<T> > {
+struct TBox2 : public TBox<TVec2<T> > {
     TBox2() {}
-    TBox2(const TVec2<f32>& i, const TVec2<f32> f) { set(i, f); }
+    TBox2(const TVec2<f32>& _i, const TVec2<f32>& _f) { 
+        TBox<TVec2<T> >::i.set(_i);
+        TBox<TVec2<T> >::f.set(_f);
+    }
     TBox2(f32 x0, f32 y0, f32 x1, f32 y1) { set(x0, y0, x1, y1); }
 
     void absolute() {

include/JSystem/JParticle/JPAParticle.h

@@ -10,11 +10,8 @@
 class JKRHeap;
 class JPABaseEmitter;
 class JPABaseParticle;
-class JPAEmitterCallBack;
 class JPAEmitterManager;
-class JPAParticleCallBack;
 class JPAResourceManager;
-struct JPAEmitterWorkData;
 
 template<typename T>
 class JPACallBackBase;

include/SSystem/SComponent/c_sxyz.h

@@ -7,8 +7,7 @@ class csXyz : public SVec {
 public:
     static const csXyz Zero;
     ~csXyz() {}
-    /* inline */ csXyz() {}
-    /* inline */ csXyz(const csXyz& other) : SVec(other){};
+    csXyz() {}
     csXyz(s16, s16, s16);
     csXyz operator+(csXyz&);
     void operator+=(csXyz&);