Merge branch 'main' of https://github.com/zeldaret/tww into agb

include/JSystem/J3DU/J3DUClipper.h

@@ -8,10 +8,10 @@ class J3DUClipper {
 public:
     J3DUClipper() { init(); }
     virtual ~J3DUClipper() {}
-    /* 80273778 */ void init();
-    /* 8027378C */ void calcViewFrustum();
-    /* 802738FC */ u32 clip(f32 const (*)[4], Vec, f32) const;
-    /* 80273A44 */ u32 clip(f32 const (*)[4], Vec*, Vec*) const;
+    void init();
+    void calcViewFrustum();
+    u32 clip(const Mtx, Vec, f32);
+    u32 clip(const Mtx, Vec*, Vec*);
 
     void setFovy(f32 fovy) { mFovY = fovy; }
     void setAspect(f32 aspect) { mAspect = aspect; }

include/JSystem/JParticle/JPAEmitter.h

@@ -12,8 +12,6 @@
 #include "dolphin/gx/GXStruct.h"
 #include "dolphin/mtx/mtx.h"
 
-class JPACallBackBase;
-class JPACallBackBase2;
 class JPADataBlockLinkInfo;
 
 enum {
@@ -26,6 +24,18 @@ enum {
     JPAEmtrStts_Immortal = 0x40,
 };
 
+template<typename T>
+class JPACallBackBase {
+public:
+    JPACallBackBase() {}
+    virtual ~JPACallBackBase();
+    
+    virtual void init(JPABaseEmitter*);
+    virtual void execute(JPABaseEmitter*);
+    virtual void executeAfter(JPABaseEmitter*);
+    virtual void draw(JPABaseEmitter*);
+};
+
 class JPABaseEmitter {
 public:
     typedef void (JPABaseEmitter::*VolumeFunc)();
@@ -111,7 +121,7 @@ public:
     /* 0x188 */ JSUPtrList mChildParticles;
     /* 0x194 */ JSUPtrList* mpPtclVacList;
     /* 0x198 */ JPADataBlockLinkInfo* mpDataLinkInfo;
-    /* 0x19C */ JPACallBackBase* mpEmitterCallBack;
+    /* 0x19C */ JPACallBackBase<JPABaseEmitter>* mpEmitterCallBack;
     /* 0x1A0 */ JPACallBackBase2* mpParticleCallBack;
     /* 0x1A4 */ JMath::TRandom_fast_ mRandomSeed;
     /* 0x1A8 */ Mtx mGlobalRotation;