Get initial JParticle import to build, label symbols.txt

26 files changed, 47 insertions, 37 deletions

diff --git a/include/JSystem/JGeometry.h b/include/JSystem/JGeometry.h
index 5ae2e827..ab44b31c 100644
--- a/include/JSystem/JGeometry.h
+++ b/include/JSystem/JGeometry.h
@@ -1,7 +1,7 @@
 #ifndef JGEOMETRY_H
 #define JGEOMETRY_H
 
-#include "dolphin/mtx.h"
+#include "common.h"
 #include "math.h"
 #include "JSystem/JMath/JMath.h"
 
diff --git a/include/JSystem/JMath/JMATrigonometric.h b/include/JSystem/JMath/JMATrigonometric.h
index 2b162c56..2111fabb 100644
--- a/include/JSystem/JMath/JMATrigonometric.h
+++ b/include/JSystem/JMath/JMATrigonometric.h
@@ -1,7 +1,7 @@
 #ifndef JMATRIGONOMETRIC_H
 #define JMATRIGONOMETRIC_H
 
-#include "dolphin/types.h"
+#include "common.h"
 #include "utility.h"
 
 template<typename T>
diff --git a/include/JSystem/JMath/JMath.h b/include/JSystem/JMath/JMath.h
index eb7932e8..343571b8 100644
--- a/include/JSystem/JMath/JMath.h
+++ b/include/JSystem/JMath/JMath.h
@@ -1,7 +1,8 @@
 #ifndef JMATH_H
 #define JMATH_H
 
-#include "dolphin/mtx.h"
+#include "common.h"
+#include "rvl/MTX.h"
 #include "math.h"
 
 void JMAMTXApplyScale(const Mtx, Mtx, f32, f32, f32);
diff --git a/include/JSystem/JMath/random.h b/include/JSystem/JMath/random.h
index cfb8ecc1..5eb9c355 100644
--- a/include/JSystem/JMath/random.h
+++ b/include/JSystem/JMath/random.h
@@ -1,7 +1,7 @@
 #ifndef RANDOM_H
 #define RANDOM_H
 
-#include "dolphin/types.h"
+#include "common.h"
 
 namespace JMath {
     
diff --git a/include/JSystem/JParticle/JPABaseShape.h b/include/JSystem/JParticle/JPABaseShape.h
index 3ebff452..c72134eb 100644
--- a/include/JSystem/JParticle/JPABaseShape.h
+++ b/include/JSystem/JParticle/JPABaseShape.h
@@ -1,11 +1,12 @@
 #ifndef JPABASESHAPE_H
 #define JPABASESHAPE_H
 
-#include <dolphin/gx.h>
+#include "common.h"
+#include "egg/egg_types.h"
+#include "rvl/GX.h"
 
 class JPAEmitterWorkData;
 class JPABaseParticle;
-class JKRHeap;
 
 /**
  * @ingroup jsystem-jparticle
@@ -46,7 +47,7 @@ struct JPABaseShapeData {
  */
 struct JPABaseShape {
 public:
-    /* 8027A6DC */ JPABaseShape(u8 const*, JKRHeap*);
+    /* 8027A6DC */ JPABaseShape(u8 const*, EGG::Heap*);
     /* 8027A7E8 */ void setGX(JPAEmitterWorkData*) const;
 
     static GXBlendMode st_bm[3];
diff --git a/include/JSystem/JParticle/JPAChildShape.h b/include/JSystem/JParticle/JPAChildShape.h
index 2761a567..598ea3f3 100644
--- a/include/JSystem/JParticle/JPAChildShape.h
+++ b/include/JSystem/JParticle/JPAChildShape.h
@@ -1,7 +1,8 @@
 #ifndef JPACHILDSHAPE_H
 #define JPACHILDSHAPE_H
 
-#include <dolphin/gx.h>
+#include "common.h"
+#include "rvl/GX.h"
 
 class JPAEmitterWorkData;
 class JPABaseParticle;
diff --git a/include/JSystem/JParticle/JPADrawInfo.h b/include/JSystem/JParticle/JPADrawInfo.h
index 061783af..a358b072 100644
--- a/include/JSystem/JParticle/JPADrawInfo.h
+++ b/include/JSystem/JParticle/JPADrawInfo.h
@@ -1,7 +1,8 @@
 #ifndef JPADRAWINFO_H
 #define JPADRAWINFO_H
 
-#include "dolphin/mtx.h"
+#include "common.h"
+#include "rvl/MTX.h"
 
 /**
  * @ingroup jsystem-jparticle
diff --git a/include/JSystem/JParticle/JPADynamicsBlock.h b/include/JSystem/JParticle/JPADynamicsBlock.h
index fc175ff6..4257f065 100644
--- a/include/JSystem/JParticle/JPADynamicsBlock.h
+++ b/include/JSystem/JParticle/JPADynamicsBlock.h
@@ -1,9 +1,10 @@
 #ifndef JPADYNAMICSBLOCK_H
 #define JPADYNAMICSBLOCK_H
 
+#include "common.h"
+
 #include "JSystem/JGeometry.h"
 
-#include "dolphin/types.h"
 
 class JPAEmitterWorkData;
 
diff --git a/include/JSystem/JParticle/JPAEmitter.h b/include/JSystem/JParticle/JPAEmitter.h
index 063b7c1f..6ac7741e 100644
--- a/include/JSystem/JParticle/JPAEmitter.h
+++ b/include/JSystem/JParticle/JPAEmitter.h
@@ -1,7 +1,8 @@
 #ifndef JPAEMITTER_H
 #define JPAEMITTER_H
 
-#include <dolphin/gx.h>
+#include "common.h"
+#include "rvl/GX.h"
 #include "JSystem/JParticle/JPAResource.h"
 #include "JSystem/JParticle/JPAList.h"
 #include "JSystem/JParticle/JPARandom.h"
diff --git a/include/JSystem/JParticle/JPAEmitterManager.h b/include/JSystem/JParticle/JPAEmitterManager.h
index 5cd69a28..d4663695 100644
--- a/include/JSystem/JParticle/JPAEmitterManager.h
+++ b/include/JSystem/JParticle/JPAEmitterManager.h
@@ -1,7 +1,8 @@
 #ifndef JPAEMITTERMANAGER_H
 #define JPAEMITTERMANAGER_H
 
-#include "dolphin/types.h"
+#include "common.h"
+#include "egg/egg_types.h"
 #include "JSystem/JParticle/JPAList.h"
 #include "JSystem/JParticle/JPADrawInfo.h"
 #include "JSystem/JSupport/JSUList.h"
@@ -12,7 +13,6 @@ class JPAParticleCallBack;
 class JPABaseEmitter;
 class JPAResourceManager;
 class JPABaseParticle;
-class JKRHeap;
 struct JPAEmitterWorkData;
 
 /**
@@ -21,7 +21,7 @@ struct JPAEmitterWorkData;
  */
 class JPAEmitterManager {
 public:
-    /* 8027DCA0 */ JPAEmitterManager(u32, u32, JKRHeap*, u8, u8);
+    /* 8027DCA0 */ JPAEmitterManager(u32, u32, EGG::Heap*, u8, u8);
     /* 8027DEBC */ JPABaseEmitter* createSimpleEmitterID(JGeometry::TVec3<f32> const&, u16, u8, u8,
                                                          JPAEmitterCallBack*, JPAParticleCallBack*);
     /* 8027DFA0 */ void calc(u8);
diff --git a/include/JSystem/JParticle/JPAExTexShape.h b/include/JSystem/JParticle/JPAExTexShape.h
index b202cc9d..04a357b1 100644
--- a/include/JSystem/JParticle/JPAExTexShape.h
+++ b/include/JSystem/JParticle/JPAExTexShape.h
@@ -1,7 +1,7 @@
 #ifndef JPAEXTEXSHAPE_H
 #define JPAEXTEXSHAPE_H
 
-#include "dolphin/types.h"
+#include "common.h"
 
 class JPAEmitterWorkData;
 
diff --git a/include/JSystem/JParticle/JPAExtraShape.h b/include/JSystem/JParticle/JPAExtraShape.h
index dbf46363..186285e9 100644
--- a/include/JSystem/JParticle/JPAExtraShape.h
+++ b/include/JSystem/JParticle/JPAExtraShape.h
@@ -1,7 +1,7 @@
 #ifndef JPAEXTRASHAPE_H
 #define JPAEXTRASHAPE_H
 
-#include "dolphin/types.h"
+#include "common.h"
 
 class JPAEmitterWorkData;
 class JPABaseParticle;
diff --git a/include/JSystem/JParticle/JPAFieldBlock.h b/include/JSystem/JParticle/JPAFieldBlock.h
index 2031ba26..8480a90d 100644
--- a/include/JSystem/JParticle/JPAFieldBlock.h
+++ b/include/JSystem/JParticle/JPAFieldBlock.h
@@ -1,10 +1,10 @@
 #ifndef JPAFIELDBLOCK_H
 #define JPAFIELDBLOCK_H
 
+#include "common.h"
+#include "egg/egg_types.h"
 #include "JSystem/JGeometry.h"
-#include "dolphin/types.h"
 
-class JKRHeap;
 class JPAEmitterWorkData;
 class JPABaseParticle;
 class JPAFieldBlock;
@@ -119,8 +119,8 @@ public:
 
 class JPAFieldBlock {
 public:
-    /* 8027D088 */ JPAFieldBlock(u8 const*, JKRHeap*);
-    /* 8027D0C0 */ void init(JKRHeap*);
+    /* 8027D088 */ JPAFieldBlock(u8 const*, EGG::Heap*);
+    /* 8027D0C0 */ void init(EGG::Heap*);
 
     u32 getType() { return mpData->mFlags & 0xF; }
     u32 getAddType() { return (mpData->mFlags >> 8) & 3; }
diff --git a/include/JSystem/JParticle/JPAKeyBlock.h b/include/JSystem/JParticle/JPAKeyBlock.h
index 3d79e854..a9eb0fbb 100644
--- a/include/JSystem/JParticle/JPAKeyBlock.h
+++ b/include/JSystem/JParticle/JPAKeyBlock.h
@@ -1,7 +1,7 @@
 #ifndef JPAKEYBLOCK_H
 #define JPAKEYBLOCK_H
 
-#include "dolphin/types.h"
+#include "common.h"
 
 /**
  * @ingroup jsystem-jparticle
diff --git a/include/JSystem/JParticle/JPAList.h b/include/JSystem/JParticle/JPAList.h
index ab2e5a7f..287fdb75 100644
--- a/include/JSystem/JParticle/JPAList.h
+++ b/include/JSystem/JParticle/JPAList.h
@@ -1,7 +1,7 @@
 #ifndef JPALIST_H
 #define JPALIST_H
 
-#include "dolphin/types.h"
+#include "common.h"
 
 /**
  * @ingroup jsystem-jparticle
diff --git a/include/JSystem/JParticle/JPAMath.h b/include/JSystem/JParticle/JPAMath.h
index 68701359..67d59fb5 100644
--- a/include/JSystem/JParticle/JPAMath.h
+++ b/include/JSystem/JParticle/JPAMath.h
@@ -1,7 +1,7 @@
 #ifndef JPAMATH_H
 #define JPAMATH_H
 
-#include "dolphin/mtx.h"
+#include "common.h"
 #include "JSystem/JGeometry.h"
 
 void JPAGetDirMtx(JGeometry::TVec3<f32> const& param_0, f32 (*param_1)[4]);
diff --git a/include/JSystem/JParticle/JPAParticle.h b/include/JSystem/JParticle/JPAParticle.h
index 2e67f8e8..dc538193 100644
--- a/include/JSystem/JParticle/JPAParticle.h
+++ b/include/JSystem/JParticle/JPAParticle.h
@@ -1,10 +1,10 @@
 #ifndef JPAPARTICLE_H
 #define JPAPARTICLE_H
 
-#include <dolphin/gx.h>
+#include "common.h"
+#include "rvl/GX.h"
 #include "JSystem/JGeometry.h"
 
-class JKRHeap;
 class JPABaseEmitter;
 class JPABaseParticle;
 class JPAEmitterCallBack;
diff --git a/include/JSystem/JParticle/JPARandom.h b/include/JSystem/JParticle/JPARandom.h
index 5ffb276d..300aa195 100644
--- a/include/JSystem/JParticle/JPARandom.h
+++ b/include/JSystem/JParticle/JPARandom.h
@@ -1,7 +1,7 @@
 #ifndef JPARANDOM_H
 #define JPARANDOM_H
 
-#include "dolphin/types.h"
+#include "common.h"
 
 /**
  * @ingroup jsystem-jparticle
diff --git a/include/JSystem/JParticle/JPAResource.h b/include/JSystem/JParticle/JPAResource.h
index 4b953233..af46fa79 100644
--- a/include/JSystem/JParticle/JPAResource.h
+++ b/include/JSystem/JParticle/JPAResource.h
@@ -1,9 +1,9 @@
 #ifndef JPARESOURCE_H
 #define JPARESOURCE_H
 
-#include "dolphin/types.h"
+#include "common.h"
+#include "egg/egg_types.h"
 
-class JKRHeap;
 class JPAEmitterWorkData;
 class JPABaseEmitter;
 class JPABaseParticle;
@@ -23,7 +23,7 @@ class JPAKeyBlock;
 class JPAResource {
 public:
     /* 80274010 */ JPAResource();
-    /* 80274080 */ void init(JKRHeap*);
+    /* 80274080 */ void init(EGG::Heap*);
     /* 802755E8 */ bool calc(JPAEmitterWorkData*, JPABaseEmitter*);
     /* 80275A94 */ void draw(JPAEmitterWorkData*, JPABaseEmitter*);
     /* 80275B74 */ void drawP(JPAEmitterWorkData*);
diff --git a/include/JSystem/JParticle/JPAResourceLoader.h b/include/JSystem/JParticle/JPAResourceLoader.h
index 10ff1e38..49cb6ce7 100644
--- a/include/JSystem/JParticle/JPAResourceLoader.h
+++ b/include/JSystem/JParticle/JPAResourceLoader.h
@@ -1,7 +1,7 @@
 #ifndef JPARESOURCELOADER_H
 #define JPARESOURCELOADER_H
 
-#include "dolphin/types.h"
+#include "common.h"
 
 class JPAResourceManager;
 
diff --git a/include/JSystem/JParticle/JPAResourceManager.h b/include/JSystem/JParticle/JPAResourceManager.h
index 2820c810..51eae363 100644
--- a/include/JSystem/JParticle/JPAResourceManager.h
+++ b/include/JSystem/JParticle/JPAResourceManager.h
@@ -1,9 +1,11 @@
 #ifndef JPARESOURCEMANAGER_H
 #define JPARESOURCEMANAGER_H
 
+#include "common.h"
+#include "egg/egg_types.h"
+#include "rvl/GX.h"
 #include "JSystem/JParticle/JPATexture.h"
 
-class JKRHeap;
 class JPAResource;
 struct ResTIMG;
 
@@ -13,7 +15,7 @@ struct ResTIMG;
  */
 class JPAResourceManager {
 public:
-    /* 80273E10 */ JPAResourceManager(void const*, JKRHeap*);
+    /* 80273E10 */ JPAResourceManager(void const*, EGG::Heap*);
     /* 80273E68 */ JPAResource* getResource(u16) const;
     /* 80273EA8 */ bool checkUserIndexDuplication(u16) const;
     /* 80273EEC */ const ResTIMG* swapTexture(ResTIMG const*, char const*);
@@ -24,7 +26,7 @@ public:
     void load(u16 idx, GXTexMapID texMapID) { mpTexArr[idx]->load(texMapID); }
 
 public:
-    /* 0x00 */ JKRHeap* mpHeap;
+    /* 0x00 */ EGG::Heap* mpHeap;
     /* 0x04 */ JPAResource** mpResArr;
     /* 0x08 */ JPATexture** mpTexArr;
     /* 0x0C */ u16 mResMax;
diff --git a/include/JSystem/JParticle/JPATexture.h b/include/JSystem/JParticle/JPATexture.h
index 19b3bed7..193bd5b6 100644
--- a/include/JSystem/JParticle/JPATexture.h
+++ b/include/JSystem/JParticle/JPATexture.h
@@ -1,6 +1,8 @@
 #ifndef JPATEXTURE_H
 #define JPATEXTURE_H
 
+#include "common.h"
+#include "rvl/GX.h"
 #include "JSystem/JUtility/JUTTexture.h"
 
 /**
diff --git a/include/JSystem/JSupport/JSUList.h b/include/JSystem/JSupport/JSUList.h
index 884b8b9b..53ee2059 100644
--- a/include/JSystem/JSupport/JSUList.h
+++ b/include/JSystem/JSupport/JSUList.h
@@ -1,7 +1,7 @@
 #ifndef JSULIST_H
 #define JSULIST_H
 
-#include "dolphin/types.h"
+#include "common.h"
 
 template <typename T>
 class JSUList;
diff --git a/include/JSystem/JSupport/JSupport.h b/include/JSystem/JSupport/JSupport.h
index c4a47c61..ef2fffcf 100644
--- a/include/JSystem/JSupport/JSupport.h
+++ b/include/JSystem/JSupport/JSupport.h
@@ -1,7 +1,7 @@
 #ifndef JSUPPORT_H
 #define JSUPPORT_H
 
-#include <dolphin.h>
+#include "common.h"
 
 /**
 * @ingroup jsystem-jsupport
diff --git a/include/JSystem/JUtility/JUTAssert.h b/include/JSystem/JUtility/JUTAssert.h
index 5d469fb3..9418a9b9 100644
--- a/include/JSystem/JUtility/JUTAssert.h
+++ b/include/JSystem/JUtility/JUTAssert.h
@@ -1,7 +1,7 @@
 #ifndef JUTASSERT_H
 #define JUTASSERT_H
 
-#include "dolphin/os.h"
+#include "rvl/OS.h"
 
 #ifdef DEBUG
 #define JUT_ASSERT(LINE, COND) \
diff --git a/include/JSystem/JUtility/JUTTexture.h b/include/JSystem/JUtility/JUTTexture.h
index 606cd581..10577e57 100644
--- a/include/JSystem/JUtility/JUTTexture.h
+++ b/include/JSystem/JUtility/JUTTexture.h
@@ -1,7 +1,7 @@
 #ifndef JUTTEXTURE_H
 #define JUTTEXTURE_H
 
-#include <dolphin/gx.h>
+#include "rvl/GX.h"
 
 class JUTPalette;