d_particle debug improvements (#3010)

include/d/d_particle.h

@@ -18,7 +18,7 @@ class JKRSolidHeap;
 class dKy_tevstr_c;
 class fopAc_ac_c;
 
-class  dPa_levelEcallBack : public JPAEmitterCallBack {
+class dPa_levelEcallBack : public JPAEmitterCallBack {
 public:
     virtual ~dPa_levelEcallBack() { cleanup(); }
     virtual void setup(JPABaseEmitter*, const cXyz*, const csXyz*, s8) = 0;
@@ -55,18 +55,17 @@ public:
     /* 0x10 */ dPa_simpleData_c* mData;
 };  // Size: 0x14
 
-class dPa_modelPcallBack : public JPAParticleCallBack {
-public:
-    virtual ~dPa_modelPcallBack() {}
-    virtual void draw(JPABaseEmitter*, JPABaseParticle*);
-};
-
 class dPa_windPcallBack : public JPAParticleCallBack {
 public:
     virtual ~dPa_windPcallBack() {}
     virtual void execute(JPABaseEmitter*, JPABaseParticle*);
 };
 
+class dPa_modelPcallBack : public JPAParticleCallBack {
+public:
+    virtual void draw(JPABaseEmitter*, JPABaseParticle*);
+};
+
 class dPa_modelEcallBack : public dPa_levelEcallBack {
 public:
     struct model_c {
@@ -127,7 +126,9 @@ public:
 
 class dPa_selectTexEcallBack : public dPa_levelEcallBack {
 public:
-    dPa_selectTexEcallBack(u8 param_0) { field_0x4 = param_0; }
+    dPa_selectTexEcallBack(u8 param_0) {
+        field_0x4 = (u8)param_0;
+    }
 
     virtual ~dPa_selectTexEcallBack() {}
     virtual void draw(JPABaseEmitter*);
@@ -136,6 +137,20 @@ public:
     /* 0x4 */ u8 field_0x4;
 };
 
+class dPa_setColorEcallBack : public dPa_levelEcallBack {
+public:
+    dPa_setColorEcallBack(const GXColor& color) { mColor = color; }
+
+    virtual ~dPa_setColorEcallBack() {}
+    virtual void draw(JPABaseEmitter* i_emitter) {
+        UNUSED(i_emitter);
+        GXSetTevColor(GX_TEVREG1, mColor);
+    }
+    virtual void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8) {}
+
+    /* 0x4 */ GXColor mColor;
+};
+
 class dPa_followEcallBack : public dPa_levelEcallBack {
 public:
     dPa_followEcallBack(u8 param_0 = 0, u8 param_1 = 0);
@@ -149,7 +164,7 @@ public:
 
     void remove() { end(); }
     JPABaseEmitter* getEmitter() { return mpEmitter; }
-    bool isEnd() {
+    int isEnd() {
         return field_0x10 & 1;
     }
 
@@ -171,25 +186,32 @@ public:
 
 class dPa_light8EcallBack : public dPa_levelEcallBack {
 public:
-    virtual ~dPa_light8EcallBack() {}
     virtual void draw(JPABaseEmitter*);
-    virtual void drawAfter(JPABaseEmitter*) { dPa_cleanupGX(); }
+    virtual void drawAfter(JPABaseEmitter* i_emitter) {
+        UNUSED(i_emitter);
+        dPa_cleanupGX();
+    }
     virtual void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8);
 };
 
 class dPa_gen_b_light8EcallBack : public dPa_levelEcallBack {
 public:
-    virtual ~dPa_gen_b_light8EcallBack() {}
     virtual void draw(JPABaseEmitter*);
-    virtual void drawAfter(JPABaseEmitter*) { dPa_cleanupGX(); }
+    virtual void drawAfter(JPABaseEmitter* i_emitter) {
+        UNUSED(i_emitter);
+        dPa_cleanupGX();
+    }
     virtual void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8);
 };
 
 class dPa_gen_d_light8EcallBack : public dPa_levelEcallBack {
 public:
-    virtual ~dPa_gen_d_light8EcallBack() {}
     virtual void draw(JPABaseEmitter*);
-    virtual void drawAfter(JPABaseEmitter*) { dPa_cleanupGX(); }
+    virtual void drawAfter(JPABaseEmitter* i_emitter) {
+        UNUSED(i_emitter);
+        dPa_cleanupGX();
+    }
+    virtual void execute(JPABaseEmitter*);
     virtual void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8);
 };
 
@@ -247,17 +269,6 @@ private:
     /* 0x14 */ cXyz const* field_0x14;
 };
 
-class dPa_setColorEcallBack : public dPa_levelEcallBack {
-public:
-    dPa_setColorEcallBack(const GXColor& color) { mColor = color; }
-
-    virtual ~dPa_setColorEcallBack() {}
-    virtual void draw(JPABaseEmitter*) { GXSetTevColor(GX_TEVREG1, mColor); }
-    virtual void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8) {}
-
-    /* 0x4 */ GXColor mColor;
-};
-
 class dPa_simpleData_c {
 public:
     ~dPa_simpleData_c();
@@ -295,10 +306,10 @@ public:
             void onEventMove() { mStatus |= 2; }
             void offEventMove() { mStatus &= ~2; }
             #endif
-            bool isEventMove() { return mStatus & 2; }
+            BOOL isEventMove() { return mStatus & 2; }
 
             void offActive() { mStatus &= (u8)~1; }
-            bool isActive() { return mStatus & 1; }
+            BOOL isActive() { return mStatus & 1; }
             u16 getNameId() { return mNameId; }
             dPa_levelEcallBack* getCallback() { return mCallback; }
 
@@ -434,7 +445,7 @@ public:
     }
 
     static JPAEmitterManager* getEmitterManager() { return mEmitterMng; }
-    static int getEmitterNum() { return mEmitterMng->getEmitterNumber(); };
+    int getEmitterNum() { return mEmitterMng->getEmitterNumber(); };
 
     static dPa_light8PcallBack* getLight8PcallBack() { 
         return &mLight8PcallBack; 
@@ -498,10 +509,11 @@ private:
     /* 0x019 */ u8 field_0x19;
     /* 0x01A */ u8 field_0x1a;
     /* 0x01B */ u8 field_0x1b;
+#if DEBUG
+    /* 0x01C */ dPa_simpleEcallBack field_0x1c[48];
+#else
     /* 0x01C */ dPa_simpleEcallBack field_0x1c[25];
-    #if DEBUG
-    u8 unk_0x210[0x1CC];
-    #endif
+#endif
     /* 0x210 */ level_c field_0x210;
     #if DEBUG
     u8 mSceneCount;

include/d/dolzel_base.pch

@@ -30,6 +30,7 @@
 #include "JSystem/J2DGraph/J2DPictureEx.h" // IWYU pragma: export
 #include "JSystem/J2DGraph/J2DScreen.h" // IWYU pragma: export
 #include "JSystem/J2DGraph/J2DTextBoxEx.h" // IWYU pragma: export
+#include "JSystem/JParticle/JPAEmitter.h" // IWYU pragma: export
 #include "JSystem/JUtility/JUTFont.h" // IWYU pragma: export
 #include "JSystem/JUtility/JUTReport.h" // IWYU pragma: export