diff --git a/config/ShieldD/symbols.txt b/config/ShieldD/symbols.txt
index f72be9f389a..45a62b4b3b0 100644
--- a/config/ShieldD/symbols.txt
+++ b/config/ShieldD/symbols.txt
@@ -64389,8 +64389,8 @@ lbl_8074C6EC = .sbss:0x8074C6EC; // type:object size:0x1 data:byte hash:0x0C373A
 mEcallback__18dPa_modelEcallBack = .sbss:0x8074C6F0; // type:object size:0x4 scope:global hash:0x5F2475C4 dhash:0x6907098D
 mPcallback__18dPa_modelEcallBack = .sbss:0x8074C6F4; // type:object size:0x4 scope:global hash:0x458FCFD1 dhash:0x25B18E98
 mModel__18dPa_modelEcallBack = .sbss:0x8074C6F8; // type:object size:0x4 scope:global data:4byte hash:0x4E4B8FC7 dhash:0x39D6160E
-lbl_8074C6FC = .sbss:0x8074C6FC; // type:object size:0x1 data:byte hash:0x45C69FFE dhash:0x7F773CF7
-lbl_8074C6FD = .sbss:0x8074C6FD; // type:object size:0x1 data:byte hash:0x52B0F54B dhash:0x3A8E0E82
+struct_80450E9C = .sbss:0x8074C6FC; // type:object size:0x1 data:byte hash:0x45C69FFE dhash:0x7F773CF7
+struct_80450E9D = .sbss:0x8074C6FD; // type:object size:0x1 data:byte hash:0x52B0F54B dhash:0x3A8E0E82
 lbl_8074C6FE = .sbss:0x8074C6FE; // type:object size:0x1 data:byte hash:0x4FCC7570 dhash:0x6CDA0703
 mEmitterMng__13dPa_control_c = .sbss:0x8074C700; // type:object size:0x4 scope:global data:4byte hash:0x6D91DA09 dhash:0x80BC120B
 mWaterBubblePcallBack__13dPa_control_c = .sbss:0x8074C704; // type:object size:0x4 scope:global hash:0x38091769 dhash:0x0789ADEB
diff --git a/include/JSystem/JGeometry.h b/include/JSystem/JGeometry.h
index f080c91f72b..c90d3bdc816 100644
--- a/include/JSystem/JGeometry.h
+++ b/include/JSystem/JGeometry.h
@@ -119,9 +119,9 @@ struct TVec3<s16> {
     }
 
     void set(s16 x_, s16 y_, s16 z_) {
-        x = x_;
-        y = y_;
-        z = z_;
+        x = (s16)x_;
+        y = (s16)y_;
+        z = (s16)z_;
     }
 };
 
@@ -175,17 +175,17 @@ inline void mulInternal(__REGISTER const f32* a, __REGISTER const f32* b, __REGI
 
 template <>
 struct TVec3<f32> : public Vec {
-    inline TVec3(const Vec& i_vec) {
+    TVec3(const Vec& i_vec) {
         setTVec3f(&i_vec.x, &x);
     }
 
-    inline TVec3(const TVec3<f32>& i_vec) {
+    TVec3(const TVec3<f32>& i_vec) {
         setTVec3f(&i_vec.x, &x);
     }
 
     template<class U>
     TVec3(U x, U y, U z) {
-        set(x, y, z);
+        set((U)x, (U)y, (U)z);
     }
 
     TVec3() {}
@@ -195,9 +195,9 @@ struct TVec3<f32> : public Vec {
 
     template<class U>
     void set(const TVec3<U>& other) {
-        x = other.x;
-        y = other.y;
-        z = other.z;
+        x = (U)other.x;
+        y = (U)other.y;
+        z = (U)other.z;
     }
 
     void set(const Vec& other) {
@@ -208,9 +208,9 @@ struct TVec3<f32> : public Vec {
 
     template<class U>
     void set(U x_, U y_, U z_) {
-        x = x_;
-        y = y_;
-        z = z_;
+        x = (U)x_;
+        y = (U)y_;
+        z = (U)z_;
     }
 
     inline void add(const TVec3<f32>& b) {
@@ -359,9 +359,9 @@ struct TVec3<f32> : public Vec {
     }
 
     void cross(const TVec3<f32>& a, const TVec3<f32>& b) {
-        VECCrossProduct(a, b, *this);
+        PSVECCrossProduct(&a, &b, this);
     }
-    
+
     f32 setLength(f32 len) {
         f32 sq = squared();
         if (sq <= TUtil<f32>::epsilon()) {
diff --git a/include/JSystem/JParticle/JPAEmitter.h b/include/JSystem/JParticle/JPAEmitter.h
index ebf82df33ea..9ce16e8f22a 100644
--- a/include/JSystem/JParticle/JPAEmitter.h
+++ b/include/JSystem/JParticle/JPAEmitter.h
@@ -79,8 +79,6 @@ public:
     virtual void executeAfter(JPABaseEmitter*) {}
     virtual void draw(JPABaseEmitter*) {}
     virtual void drawAfter(JPABaseEmitter*) {}
-    
-    //~JPAEmitterCallBack();
 };
 
 enum {
@@ -160,34 +158,16 @@ public:
         mGlobalPScl.y = height;
     }
     void setGlobalParticleScale(const JGeometry::TVec3<f32>& scale) {
-        mGlobalPScl.set(scale.x, scale.y);
+        mGlobalPScl.set((f32)scale.x, (f32)scale.y);
     }
     void setGlobalParticleScale(f32 scaleX, f32 scaleY) {
         mGlobalPScl.set(scaleX, scaleY);
     }
     void getGlobalParticleScale(JGeometry::TVec3<f32>& scale) const {
-        //TODO: Possible fakematch. Debug and Wii indicate TVec3::set, but using it breaks regalloc
-        //      in dPa_gen_b_light8PcallBack::draw on GCN (where the call to set would normally be
-        //      inlined).
-#if PLATFORM_GCN
-        scale.x = mGlobalPScl.x;
-        scale.y = mGlobalPScl.y;
-        scale.z = 1.0f;
-#else
         scale.set(mGlobalPScl.x, mGlobalPScl.y, 1.0f);
-#endif
     }
     void getGlobalParticleScale(JGeometry::TVec3<f32>* scale) const {
-        //TODO: Possible fakematch. Debug and Wii indicate TVec3::set, but using it breaks regalloc
-        //      in dPa_gen_b_light8PcallBack::draw on GCN (where the call to set would normally be
-        //      inlined).
-#if PLATFORM_GCN
-        scale->x = mGlobalPScl.x;
-        scale->y = mGlobalPScl.y;
-        scale->z = 1.0f;
-#else
         scale->set(mGlobalPScl.x, mGlobalPScl.y, 1.0f);
-#endif
     }
     void setGlobalScale(const JGeometry::TVec3<f32>& scale) {
         mGlobalScl.set(scale);
diff --git a/include/d/d_particle.h b/include/d/d_particle.h
index dd90e5735ad..a57a6918b7f 100644
--- a/include/d/d_particle.h
+++ b/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;
diff --git a/include/d/dolzel_base.pch b/include/d/dolzel_base.pch
index 0c900c21a15..46c707b5047 100644
--- a/include/d/dolzel_base.pch
+++ b/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
 
diff --git a/include/m_Do/m_Do_mtx.h b/include/m_Do/m_Do_mtx.h
index a85f7e9b4f7..793416ca4eb 100644
--- a/include/m_Do/m_Do_mtx.h
+++ b/include/m_Do/m_Do_mtx.h
@@ -146,6 +146,10 @@ inline void mDoMtx_quat(Mtx m, const Quaternion* q) {
     MTXQuat(m, q);
 }
 
+inline void cMtx_identity(Mtx mtx) {
+    mDoMtx_identity(mtx);
+}
+
 inline void cMtx_inverse(const Mtx a, Mtx b) {
     mDoMtx_inverse(a, b);
 }
diff --git a/src/d/d_particle.cpp b/src/d/d_particle.cpp
index f4c164ef295..a955d202fe7 100644
--- a/src/d/d_particle.cpp
+++ b/src/d/d_particle.cpp
@@ -26,7 +26,7 @@
 #include "SSystem/SComponent/c_math.h"
 
 #if DEBUG
-#pragma nosyminline on
+//#pragma nosyminline on
 #endif
 
 extern dPa_particleTracePcallBack_c JPTracePCB4;
@@ -54,12 +54,6 @@ void dPa_cleanupGX() {
     GXSetNumChans(0);
 }
 
-static GXColor l_lifeBallColor[3] = {
-    {0xEB, 0x20, 0x78, 0xFF},
-    {0x20, 0xF1, 0x9B, 0xFF},
-    {0xEB, 0xD7, 0x2F, 0xFF},
-};
-
 dPa_followEcallBack::dPa_followEcallBack(u8 param_0, u8 param_1) {
     field_0x11 = param_0;
     field_0x12 = param_1;
@@ -71,15 +65,7 @@ void dPa_followEcallBack::execute(JPABaseEmitter* i_emitter) {
     if ((field_0x12 == 0) && ((field_0x10 & 2) == 0)) {
         i_emitter->setGlobalTranslation(field_0x8->x, field_0x8->y, field_0x8->z);
         if (field_0xc != NULL) {
-            // LIKELY FAKEMATCH
-            #if DEBUG
             JGeometry::TVec3<s16> aTStack_24(field_0xc->x, field_0xc->y, field_0xc->z);
-            #else
-            JGeometry::TVec3<s16> aTStack_24;
-            aTStack_24.x = field_0xc->x;
-            aTStack_24.y = field_0xc->y;
-            aTStack_24.z = field_0xc->z;
-            #endif
             i_emitter->setGlobalRotation(aTStack_24);
         }
     }
@@ -94,7 +80,10 @@ void dPa_followEcallBack::execute(JPABaseEmitter* i_emitter) {
     }
 }
 
-void dPa_followEcallBack::draw(JPABaseEmitter* i_emitter) {}
+void dPa_followEcallBack::draw(JPABaseEmitter* i_emitter) {
+    if (i_emitter->getGroupID() == 3) {
+    }
+}
 
 void dPa_followEcallBack::setup(JPABaseEmitter* i_emitter, cXyz const* param_1,
                                 csXyz const* param_2, s8) {
@@ -143,22 +132,29 @@ static u8 struct_80450E9C;
 static u8 struct_80450E9D;
 
 void dPa_light8EcallBack::setup(JPABaseEmitter* i_emitter, cXyz const* param_1, csXyz const* param_2, s8 param_3) {
+    UNUSED(param_1);
+    UNUSED(param_2);
+    UNUSED(param_3);
     i_emitter->setDrawTimes(2);
     i_emitter->setParticleCallBackPtr(dPa_control_c::getLight8PcallBack());
 }
 
 void dPa_gen_b_light8EcallBack::setup(JPABaseEmitter* i_emitter, cXyz const* param_1, csXyz const* param_2, s8 param_3) {
-    u32 userWork = param_3;
+    UNUSED(param_1);
+    UNUSED(param_2);
+    UNUSED(param_3);
     i_emitter->setDrawTimes(2);
     i_emitter->setParticleCallBackPtr(dPa_control_c::getGen_b_Light8PcallBack());
-    i_emitter->setUserWork((s8)userWork);
+    i_emitter->setUserWork(param_3);
 }
 
 void dPa_gen_d_light8EcallBack::setup(JPABaseEmitter* i_emitter, cXyz const* param_1, csXyz const* param_2, s8 param_3) {
-    u32 userWork = param_3;
+    UNUSED(param_1);
+    UNUSED(param_2);
+    UNUSED(param_3);
     i_emitter->setDrawTimes(2);
     i_emitter->setParticleCallBackPtr(dPa_control_c::getGen_d_Light8PcallBack());
-    i_emitter->setUserWork((s8)userWork);
+    i_emitter->setUserWork(param_3);
 }
 
 static void dPa_group_id_change(u32* param_0, u8* param_1) {
@@ -217,18 +213,18 @@ static void initiateLighting8(_GXColor& param_0, s16 param_1) {
     GXSetChanCtrl(GX_ALPHA0, false, GX_SRC_REG, GX_SRC_VTX, 0xfe, GX_DF_CLAMP, GX_AF_SPOT);
     s32 r,g,b;
     GXColor color0;
-    color0.r = r = (param_1 & 0x1F) << 1;
-    color0.g = g = ((param_1 >> 5) & 0x1F) << 1;
-    color0.b = b = ((param_1 >> 10) & 0x1F) << 1;
+    color0.r = (param_1 & 0x1F) << 1;
+    color0.g = ((param_1 >> 5) & 0x1F) << 1;
+    color0.b = ((param_1 >> 10) & 0x1F) << 1;
     if (daPy_py_c::checkNowWolfPowerUp()) {
         f32 fVar1 = (g_env_light.bg_amb_col[0].r / 255.0f);
-        color0.r = (r + 0x10) * (4.0f * (fVar1));
+        color0.r = (((param_1 & 0x1F) << 1) + 0x10) * (4.0f * (fVar1));
 
         fVar1 = (g_env_light.bg_amb_col[0].g / 255.0f);
-        color0.g = (g + 0x10) * (4.0f * (fVar1));
+        color0.g = ((((param_1 >> 5) & 0x1F) << 1) + 0x10) * (4.0f * (fVar1));
 
         fVar1 = (g_env_light.bg_amb_col[0].b / 255.0f);
-        color0.b = (b + 0x10) * (4.0f * (fVar1));
+        color0.b = ((((param_1 >> 10) & 0x1F) << 1) + 0x10) * (4.0f * (fVar1));
     }
 
     if (color0.r == 0x3e) {
@@ -259,13 +255,21 @@ static void drawFirst(JPABaseEmitter* i_emitter) {
 }
 
 static void drawFirst_l8(JPABaseEmitter* i_emitter) {
+    UNUSED(i_emitter);
     GXSetColorUpdate(false);
 }
 
+static void dummy2() {
+    // fixes weak function order for debug
+    GXSetTexCoordGen(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, 0x3c);
+}
+
 static void drawSecond_light8(JPABaseEmitter* i_emitter) {
     GXColor globalPrmColor;
     i_emitter->getGlobalPrmColor(&globalPrmColor);
-    s16 sVar3 = (s16)((s16)globalPrmColor.r << 8) + (s16)globalPrmColor.g;
+    s16 sVar3 = globalPrmColor.r;
+    sVar3 <<= 8;
+    sVar3 = sVar3 + globalPrmColor.g;
     dScnKy_env_light_c* envLight = dKy_getEnvlight();
     dKy_setLight_nowroom_grass(dComIfGp_roomControl_getStayNo(), 0.0f);
     GXSetColorUpdate(1);
@@ -296,6 +300,7 @@ static void drawSecond_light8(JPABaseEmitter* i_emitter) {
 }
 
 static void drawSecond_b_light8(JPABaseEmitter* i_emitter) {
+    UNUSED(i_emitter);
     dScnKy_env_light_c* envLight = dKy_getEnvlight();
     dKy_setLight_nowroom(dComIfGp_roomControl_getStayNo());
     GXSetColorUpdate(true);
@@ -416,18 +421,16 @@ void dPa_gen_d_light8EcallBack::draw(JPABaseEmitter* i_emitter) {
 }
 
 static void dPa_setWindPower(JPABaseParticle* param_0) {
-    f32 local_58;
-    JGeometry::TVec3<f32> aTStack_18;
-    JGeometry::TVec3<f32> aTStack_24;
-    JGeometry::TVec3<f32> aTStack_30;
-    cXyz cStack_3c;
-    param_0->getOffsetPosition(&aTStack_24);
-    dKyw_get_AllWind_vec((cXyz*)&aTStack_24, &cStack_3c, &local_58);
-    cStack_3c.y = 0.65f;
-    JGeometry::TVec3<f32> aTStack_48;
-    JGeometry::setTVec3f(cStack_3c * (9.0f * local_58), *(Vec*)&aTStack_48);
-    aTStack_24 += aTStack_48;
-    param_0->setOffsetPosition(aTStack_24);
+    f32 sp08;
+    JGeometry::TVec3<f32> sp48;
+    JGeometry::TVec3<f32> sp3C;
+    JGeometry::TVec3<f32> sp30;
+    cXyz sp24;
+    param_0->getOffsetPosition(&sp3C);
+    dKyw_get_AllWind_vec((cXyz*)&sp3C, &sp24, &sp08);
+    sp24.y = 0.65f;
+    sp3C += JGeometry::TVec3<f32>(sp24 * (9.0f * sp08));
+    param_0->setOffsetPosition(sp3C);
 }
 
 void dPa_modelPcallBack::draw(JPABaseEmitter* i_emitter, JPABaseParticle* param_1) {
@@ -609,10 +612,9 @@ void dPa_modelEcallBack::draw(JPABaseEmitter* i_emitter) {
 void dPa_modelEcallBack::setup(JPABaseEmitter* i_emitter, cXyz const* param_1, csXyz const* param_2, s8 param_3) {
     i_emitter->setEmitterCallBackPtr(NULL);
     if (mModel != NULL) {
-        int sVar1 = struct_80450E9C;
-        for (int i = 0; i < sVar1; i++) {
-            int x = struct_80450E9D / sVar1;
-            struct_80450E9D -= (x) * sVar1;
+        int sVar1;// = struct_80450E9C;
+        for (int var_r30 = 0; var_r30 < struct_80450E9C; var_r30++) {
+            struct_80450E9D %= struct_80450E9C;
             if (mModel[struct_80450E9D].getModelData() == NULL) {
                 i_emitter->setUserWork(struct_80450E9D++);
                 i_emitter->setParticleCallBackPtr(&mPcallback);
@@ -725,7 +727,7 @@ void dPa_simpleEcallBack::executeAfter(JPABaseEmitter* i_emitter) {
         i_emitter->playCreateParticle();
         for (; field_0xc != 0; field_0xc--) {
             Vec local_3c;
-            if ((int)mDoLib_clipper::clip(j3dSys.getViewMtx(), *(Vec*)pData, 200.0f) == 0) {
+            if ((int)mDoLib_clipper::clip(j3dSys.getViewMtx(), pData->field_0x00, 200.0f) == 0) {
                 JGeometry::TVec3<f32> aTStack_30;
                 i_emitter->getLocalTranslation(&aTStack_30);
                 i_emitter->setGlobalTranslation(pData->field_0x00.x, pData->field_0x00.y + aTStack_30.y, pData->field_0x00.z);
@@ -733,9 +735,10 @@ void dPa_simpleEcallBack::executeAfter(JPABaseEmitter* i_emitter) {
                 i_emitter->setGlobalAlpha(pData->field_0x0c.a);
                 i_emitter->setGlobalEnvColor(pData->field_0x10.r, pData->field_0x10.g, pData->field_0x10.b);
                 for (int i = 0; i < currentCreateNumber; i++) {
-                    JPABaseParticle* particle = (JPABaseParticle*)i_emitter->createParticle();
-                    if (particle == NULL)
+                    JPABaseParticle* particle;
+                    if ((particle = (JPABaseParticle*)i_emitter->createParticle()) == NULL) {
                         break;
+                    }
                     particle->setOffsetPosition(pData->field_0x00.x, pData->field_0x00.y + aTStack_30.y, pData->field_0x00.z);
                 }
             }
@@ -747,7 +750,10 @@ void dPa_simpleEcallBack::executeAfter(JPABaseEmitter* i_emitter) {
 }
 
 void dPa_simpleEcallBack::draw(JPABaseEmitter* i_emitter) {
-    /* empty function */
+    if (i_emitter->getGroupID() != 3 && i_emitter->getGroupID() != 11) {
+        if (i_emitter->getGroupID() == 13) {
+        }
+    }
 }
 
 JPABaseEmitter* dPa_simpleEcallBack::create(JPAEmitterManager* param_0, u16 id, u8 param_2) {
@@ -792,7 +798,8 @@ JPABaseEmitter* dPa_simpleEcallBack::createEmitter(JPAEmitterManager* param_0) {
 }
 
 u32 dPa_simpleEcallBack::set(cXyz const* i_pos, dKy_tevstr_c const* param_2, u8 param_3,
-                                  _GXColor const& param_4, _GXColor const& param_5, int param_6, f32 param_7) {
+                             _GXColor const& param_4, _GXColor const& param_5, int param_6,
+                             f32 param_7) {
     f32 fVar1;
     f32 dVar7 = param_7;
     if (param_2 != NULL && param_2->Material_use_fg != 124) {
@@ -800,6 +807,8 @@ u32 dPa_simpleEcallBack::set(cXyz const* i_pos, dKy_tevstr_c const* param_2, u8
         return 0;
     }
 
+    // FAKEMATCH: Debug indicates this temporary is fake and mData is used directly, but doing this
+    //            causes an r3/r4 regswap on GCN retail
     dPa_simpleData_c* pData = mData;
     if (pData == NULL || field_0xc >= field_0xe) {
         if (pData == NULL) {
@@ -1004,10 +1013,13 @@ dPa_control_c::level_c::emitter_c* dPa_control_c::level_c::get(u32 id) {
         return NULL;
     }
 
-    for (emitter_c* emitter = mTable[id & 0xFF]; emitter != NULL; emitter = emitter->getNext()) {
+    u8 idx = id;
+    emitter_c* emitter = mTable[idx];
+    while (emitter != NULL) {
         if (id == emitter->getId()) {
             return emitter;
         }
+        emitter = emitter->getNext();
     }
 
     return NULL;
@@ -1046,10 +1058,7 @@ u32 dPa_control_c::level_c::entry(u16 i_name, JPABaseEmitter* i_emitter, dPa_lev
 
     for (int i = 0; i < EMITTER_MAX; i++) {
         if (mEmitter[mFreeNo].getId() == 0) {
-            u32 uvar1 = field_0x0 + 1;
-            field_0x0 = uvar1;
-
-            if (uvar1 == 0) {
+            if ((field_0x0 = field_0x0 + 1) == 0) {
                 field_0x0++;
             }
 
@@ -1091,7 +1100,8 @@ void dPa_control_c::level_c::cutTable(dPa_control_c::level_c::emitter_c* i_emitt
     emitter_c* next = i_emitter->getNext();
 
     if (pre == NULL) {
-        mTable[i_emitter->getId() & 0xFF] = next;
+        u8 id = i_emitter->getId();
+        mTable[id] = next;
     } else {
         pre->setNext(next);
     }
@@ -1114,6 +1124,12 @@ dPa_selectTexEcallBack dPa_control_c::mTsubo[] = {
     dPa_selectTexEcallBack(7),
 };
 
+static GXColor l_lifeBallColor[3] = {
+    {0xEB, 0x20, 0x78, 0xFF},
+    {0x20, 0xF1, 0x9B, 0xFF},
+    {0xEB, 0xD7, 0x2F, 0xFF},
+};
+
 dPa_setColorEcallBack dPa_control_c::mLifeBall[3] = {
     dPa_setColorEcallBack(l_lifeBallColor[0]),
     dPa_setColorEcallBack(l_lifeBallColor[1]),
@@ -1145,7 +1161,12 @@ Mtx dPa_control_c::mWindViewMatrix;
 dPa_particleTracePcallBack_c dPa_control_c::mParticleTracePCB;
 
 dPa_control_c::dPa_control_c() {
-    m_resHeap = JKRCreateExpHeap(0x96000, mDoExt_getArchiveHeap(), false);
+#if DEBUG
+    size_t heapSize = 0x1f0800;
+#else
+    size_t heapSize = 0x96000;
+#endif
+    m_resHeap = JKRCreateExpHeap(heapSize, mDoExt_getArchiveHeap(), false);
     JUT_ASSERT(2426, m_resHeap != NULL);
     mHeap = NULL;
     mSceneHeap = NULL;
@@ -1156,15 +1177,23 @@ dPa_control_c::dPa_control_c() {
     mSceneResMng = NULL;
     m_sceneRes = NULL;
 
-    MTXIdentity(mWindViewMatrix);
+    cMtx_identity(mWindViewMatrix);
+
+#if DEBUG
+    mSceneCount = 0;
+#endif
 }
 
 u8 dPa_control_c::getRM_ID(u16 param_0) {
-    return (param_0 >> 15) & 1;
+    return (param_0 & 0x8000) == 0 ? FALSE : TRUE;
 }
 
 void dPa_control_c::createCommon(void const* param_0) {
-    OS_REPORT("常駐パーティクルリソースサイズ<%d>\n", mHeap->getSize((void*)param_0));
+#if DEBUG
+    s32 heapSize = m_resHeap->getSize((void*)param_0);
+    // "Resident particle resource size"
+    OS_REPORT("常駐パーティクルリソースサイズ<%d>\n", heapSize);
+#endif
     mHeap = mDoExt_createSolidHeapFromSystem(0, 0);
     JUT_ASSERT(2518, mHeap != NULL);
     mCommonResMng = new (mHeap, 0) JPAResourceManager(param_0, mHeap);
@@ -1235,7 +1264,11 @@ void dPa_control_c::createScene(void const* param_0) {
     }
     if (param_0 != NULL) {
         m_sceneRes = (void*)param_0;
-        OS_REPORT("シーン依存パーティクルリソースサイズ<%d>\n", m_resHeap->getSize(m_sceneRes));
+#if DEBUG
+        s32 resHeapSize = m_resHeap->getSize(m_sceneRes);
+        // "Scene-dependent particle resource size"
+        OS_REPORT("シーン依存パーティクルリソースサイズ<%d>\n", resHeapSize);
+#endif
     }
     if (m_sceneRes != NULL) {
         createRoomScene();
@@ -1255,7 +1288,7 @@ bool dPa_control_c::removeRoomScene(bool param_0) {
     field_0x19 = field_0x1a;
     if (param_0) {
         JUT_ASSERT(2710, !(--mSceneCount));
-        JKRHeap::free(m_sceneRes, NULL);
+        JKRFree(m_sceneRes);
         m_sceneRes = NULL;
         field_0x18 = 0xff;
     }
@@ -1328,7 +1361,8 @@ void dPa_control_c::draw(JPADrawInfo* param_0, u8 param_1) {
     }
 }
 
-void dPa_control_c::setHitMark(u16 param_1, fopAc_ac_c* param_2, cXyz const* param_3, csXyz const* param_4, cXyz const* param_5, u32 param_6) {
+void dPa_control_c::setHitMark(u16 param_1, fopAc_ac_c* param_2, cXyz const* param_3,
+                               csXyz const* param_4, cXyz const* param_5, u32 param_6) {
     cXyz const* pPos = param_3;
     csXyz const* pAngle = param_4;
     cXyz cStack_34;
@@ -1340,8 +1374,8 @@ void dPa_control_c::setHitMark(u16 param_1, fopAc_ac_c* param_2, cXyz const* par
 
         fopAcM_OnStatus(param_2, 0x40000000);
         if (fopAcM_GetJntCol(param_2) != NULL) {
-            dJntCol_c* jntCol = fopAcM_GetJntCol(param_2);
-            if (jntCol->getHitmarkPosAndAngle(pPos, pAngle, &cStack_34, &cStack_78, param_1 == 6) >= 0) {
+            if (fopAcM_GetJntCol(param_2)->getHitmarkPosAndAngle(param_3, param_4, &cStack_34,
+                                                                 &cStack_78, param_1 == 6) >= 0) {
                 pPos = &cStack_34;
                 pAngle = &cStack_78;
             }
@@ -1428,18 +1462,13 @@ JPABaseEmitter* dPa_control_c::set(u8 param_0, u16 param_1, cXyz const* i_pos,
     }
 
     u32 local_ac = local_a8->getResUserWork(param_1);
+    f32 var_f31 = param_12;
     if (param_3 != NULL && param_3->Material_use_fg != 0x7c) {
         return NULL;
     }
 
     dPa_group_id_change(&local_ac, &param_0);
-    // FAKEMATCH
-    #if DEBUG
     JGeometry::TVec3<f32> aTStack_78(i_pos->x, i_pos->y, i_pos->z);
-    #else
-    JGeometry::TVec3<f32> aTStack_78;
-    aTStack_78.set(i_pos->x, i_pos->y, i_pos->z);
-    #endif
     JPABaseEmitter* this_00 = mEmitterMng->createSimpleEmitterID(
         aTStack_78, param_1, param_0,
         local_e0, NULL, NULL
@@ -1457,26 +1486,12 @@ JPABaseEmitter* dPa_control_c::set(u8 param_0, u16 param_1, cXyz const* i_pos,
     }
 
     if (i_rotation != NULL) {
-        #if DEBUG
         JGeometry::TVec3<s16> aTStack_a4(i_rotation->x, i_rotation->y, i_rotation->z);
-        #else
-        JGeometry::TVec3<s16> aTStack_a4;
-        aTStack_a4.x = i_rotation->x;
-        aTStack_a4.y = i_rotation->y;
-        aTStack_a4.z = i_rotation->z;
-        #endif
         this_00->setGlobalRotation(aTStack_a4);
     }
 
     if (i_scale != NULL) {
-        #if DEBUG
         JGeometry::TVec3<f32> aTStack_84(i_scale->x, i_scale->y, i_scale->z);
-        #else
-        JGeometry::TVec3<f32> aTStack_84;
-        aTStack_84.x = i_scale->x;
-        aTStack_84.y = i_scale->y;
-        aTStack_84.z = i_scale->z;
-        #endif
         this_00->setGlobalScale(aTStack_84);
     }
 
@@ -1515,7 +1530,7 @@ JPABaseEmitter* dPa_control_c::set(u8 param_0, u16 param_1, cXyz const* i_pos,
         }
     } else {
         if ((local_ac & 0xef0000) >> 0x10 < 100) {
-            param_12 = ((local_ac & 0xef0000) >> 0x10) / 99.0f;
+            var_f31 = ((local_ac & 0xef0000) >> 0x10) / 99.0f;
         }
 
         if ((local_ac & 0x20) != 0) {
@@ -1532,7 +1547,7 @@ JPABaseEmitter* dPa_control_c::set(u8 param_0, u16 param_1, cXyz const* i_pos,
             }
 
             dKy_ParticleColor_get_actor((cXyz*)i_pos, (dKy_tevstr_c*)param_3, &local_b0,
-                                        &local_b4, &local_b8, &local_bc, param_12);
+                                        &local_b4, &local_b8, &local_bc, var_f31);
             this_00->setGlobalEnvColor(local_b0.r, local_b0.g, local_b0.b);
             this_00->setGlobalPrmColor(local_b4.r, local_b4.g, local_b4.b);
         } else if ((local_ac & 0x40) != 0) {
@@ -1550,10 +1565,11 @@ JPABaseEmitter* dPa_control_c::set(u8 param_0, u16 param_1, cXyz const* i_pos,
             }
 
             dKy_ParticleColor_get_bg((cXyz*)i_pos, (dKy_tevstr_c*)param_3, &local_c0,
-                                    &local_c4, &local_c8, &local_cc, param_12);
-            param_12 = g_env_light.bg_light_influence + (1.0f - g_env_light.bg_light_influence) * param_12;
-            local_c0 = dKy_light_influence_col(&local_c0, param_12);
-            local_c4 = dKy_light_influence_col(&local_c4, param_12);
+                                    &local_c4, &local_c8, &local_cc, var_f31);
+            f32 var_f30 = g_env_light.bg_light_influence +
+                (1.0f - g_env_light.bg_light_influence) * var_f31;
+            local_c0 = dKy_light_influence_col(&local_c0, var_f30);
+            local_c4 = dKy_light_influence_col(&local_c4, var_f30);
             this_00->setGlobalEnvColor(local_c0.r, local_c0.g, local_c0.b);
             this_00->setGlobalPrmColor(local_c4.r, local_c4.g, local_c4.b);
         } else {
@@ -1568,12 +1584,7 @@ JPABaseEmitter* dPa_control_c::set(u8 param_0, u16 param_1, cXyz const* i_pos,
     }
 
     if (param_11 != NULL) {
-        #if DEBUG
         JGeometry::TVec3<f32> aTStack_9c(param_11->x, param_11->y, param_11->z);
-        #else
-        JGeometry::TVec3<f32> aTStack_9c;
-        aTStack_9c.set(param_11->x, param_11->y, param_11->z);
-        #endif
         this_00->setGlobalParticleScale(aTStack_9c);
     }
     return this_00;
@@ -1618,21 +1629,19 @@ JPABaseEmitter* dPa_control_c::setPoly(u16 param_0, cBgS_PolyInfo& param_1, cXyz
                         param_7, param_8, &a_Stack_10, &a_Stack_14, param_9, local_c);
 }
 
+void dummy3() {
+    ((dPa_control_c*)NULL)->levelExecute(0);
+}
+
 bool dPa_control_c::newSimple(u16 param_0, u8 param_1, u32* param_2) {
-    if (
-        #if DEBUG
-        field_0x19 >= 0x30
-        #else
-        field_0x19 >= 0x19
-        #endif
-    ) {
+    if (field_0x19 >= ARRAY_SIZE(field_0x1c)) {
         OSReport("\x1B[43;30m１エミッター登録数オーバー！！\n");
         return false;
     }
 
     JPABaseEmitter* emitter = field_0x1c[field_0x19].create(mEmitterMng, param_0, param_1);
     if (emitter == NULL) {
-        return false;;
+        return false;
     }
     field_0x19++;
     return true;
@@ -1652,10 +1661,11 @@ u32 dPa_control_c::setSimple(u16 param_0, cXyz const* i_pos, dKy_tevstr_c const*
 
 dPa_simpleEcallBack* dPa_control_c::getSimple(u16 param_0) {
     dPa_simpleEcallBack* arr = field_0x1c;
-    for (int i = 0; i < field_0x19; i++, arr++) {
+    for (int i = 0; i < field_0x19; i++) {
         if (param_0 == arr->getID()) {
             return arr;
         }
+        arr++;
     }
 
     return NULL;
@@ -1697,11 +1707,9 @@ static void dPa_kankyocolor_set(f32 param_0, JPABaseEmitter* param_1,
         }
         dKy_ParticleColor_get_bg((cXyz*)param_4, (dKy_tevstr_c*)param_2, &local_70, &local_74,
                                 &local_78, &local_7c, fVar1);
-        fVar1 = g_env_light.bg_light_influence + (1.0f - g_env_light.bg_light_influence) * fVar1;
-        local_70 = dKy_light_influence_col(&local_70, fVar1);
-        //_GXColor::operator_ = (&local_70, (_GXColor*)&local_80);
-        local_74 = dKy_light_influence_col(&local_74, fVar1);
-        //_GXColor::operator_ = (&local_74, (_GXColor*)&local_84);
+        f32 var_f30 = g_env_light.bg_light_influence + (1.0f - g_env_light.bg_light_influence) * fVar1;
+        local_70 = dKy_light_influence_col(&local_70, var_f30);
+        local_74 = dKy_light_influence_col(&local_74, var_f30);
         param_1->setGlobalEnvColor(local_70.r, local_70.g, local_70.b);
         param_1->setGlobalPrmColor(local_74.r, local_74.g, local_74.b);
     }
@@ -1723,11 +1731,8 @@ u32 dPa_control_c::set(u32 param_0, u8 param_1, u16 param_2, cXyz const* pos,
             if (this_00->getCallback() == 0) {
                 pJVar4->setGlobalTranslation(pos->x, pos->y, pos->z);
                 if (i_rotation != NULL) {
-                    JGeometry::TVec3<s16> aTStack_64;
-                    aTStack_64.x = i_rotation->x;
-                    aTStack_64.y = i_rotation->y;
-                    aTStack_64.z = i_rotation->z;
-                    pJVar4->setGlobalRotation(aTStack_64);
+                    JGeometry::TVec3<s16> rot(i_rotation->x, i_rotation->y, i_rotation->z);
+                    pJVar4->setGlobalRotation(rot);
                 }
             }
             if (pJVar4->checkStatus(JPAEmtrStts_StopEmit)) {
@@ -1800,7 +1805,7 @@ u32 dPa_control_c::setSimpleFoot(u32 param_0, u32* param_1, cBgS_PolyInfo& param
         {ID_ZI_J_DASHSMOKE_A, ID_ZI_J_DOWNSMOKE_A}, {ID_ZI_J_DASHKUSA_A, ID_ZI_J_DOWNKUSA_A}, {ID_ZI_J_DASHWTRA_A, ID_ZI_J_DOWNWTRA_A},
         {dPa_RM(ID_ZI_S_DASHSAND_A), dPa_RM(ID_ZI_S_DOWNSAND_A)}, {dPa_RM(ID_ZI_S_DASHSNOW_A), dPa_RM(ID_ZI_S_DOWNSNOW_A)}, {dPa_RM(ID_ZI_S_DASHSMOKE_INWTR_A), dPa_RM(ID_ZI_S_DOWNSMOKE_INWTR_A)},
     };
-    u32 rv = setNormal(param_0, effectIDTable[effType][param_5],
+    param_0 = setNormal(param_0, effectIDTable[effType][param_5],
         param_3, param_4, param_6, param_7, local_50, param_8, param_9, &a_Stack_48,
         &a_Stack_4c, param_10, local_44);
     u8 effType2 = dKy_pol_efftype2_get(&param_2);
@@ -1812,13 +1817,24 @@ u32 dPa_control_c::setSimpleFoot(u32 param_0, u32* param_1, cBgS_PolyInfo& param
             param_3, param_4, param_6, param_7, local_50, param_8, param_9, &a_Stack_48,
             &a_Stack_4c, param_10, local_44);
     }
-    return rv;
+    return param_0;
 }
 
 u16 dPa_control_c::setCommonPoly(u32* param_0, cBgS_PolyInfo* param_1, cXyz const* param_2,
                                       cXyz const* param_3, dKy_tevstr_c const* param_4, u32 param_5,
                                       u32 param_6, csXyz const* param_7, cXyz const* param_8,
                                       s8 param_9) {
+    static u16 ringID[6][4] = {
+        {ID_ZI_J_DOWNSMOKE_A, 0xFFFF, 0xFFFF, 0xFFFF}, {ID_ZI_J_DOWNKUSA_A, 0xFFFF, 0xFFFF, 0xFFFF},
+        {ID_ZI_J_DASHWTRA_A, ID_ZI_J_DASHWTRA_B, ID_ZI_J_DASHWTRA_C, 0xFFFF}, {dPa_RM(ID_ZI_S_DOWNSAND_A), 0xFFFF, 0xFFFF, 0xFFFF},
+        {dPa_RM(ID_ZI_S_DOWNSNOW_A), dPa_RM(ID_ZI_S_DOWNSNOW_B), 0xFFFF, 0xFFFF}, {dPa_RM(ID_ZI_S_DOWNSMOKE_INWTR_A), 0xFFFF, 0xFFFF, 0xFFFF},
+    };
+    static u16 normalID[6][4] = {
+        {ID_ZI_J_DASHSMOKE_A, 0xFFFF, 0xFFFF, 0xFFFF}, {ID_ZI_J_DASHKUSA_A, 0xFFFF, 0xFFFF, 0xFFFF},
+        {ID_ZI_J_DOWNWTRA_A, ID_ZI_J_DOWNWTRA_B, ID_ZI_J_DOWNWTRA_C, ID_ZI_J_DOWNWTRA_D}, {dPa_RM(ID_ZI_S_DASHSAND_A), 0xFFFF, 0xFFFF, 0xFFFF},
+        {dPa_RM(ID_ZI_S_DASHSNOW_A), dPa_RM(ID_ZI_S_DASHSNOW_B), 0xFFFF, 0xFFFF}, {dPa_RM(ID_ZI_S_DASHSMOKE_INWTR_A), 0xFFFF, 0xFFFF, 0xFFFF},
+    };
+
     f32 local_30;
     GXColor a_Stack_34;
     GXColor a_Stack_38;
@@ -1831,7 +1847,7 @@ u16 dPa_control_c::setCommonPoly(u32* param_0, cBgS_PolyInfo* param_1, cXyz cons
     u16 uVar5 = 0;
     u8 local_4c;
     if (dComIfG_Bgsp().ChkPolySafe(*param_1) == 0) {
-        return 0;
+        return uVar5;
     }
 
     int local_44 = dComIfG_Bgsp().GetPolyAtt0(*param_1);
@@ -1860,17 +1876,7 @@ u16 dPa_control_c::setCommonPoly(u32* param_0, cBgS_PolyInfo* param_1, cXyz cons
         {
             uVar5 |= (0xff << (i << 3));
         } else {
-            static u16 ringID[6][4] = {
-                {ID_ZI_J_DOWNSMOKE_A, 0xFFFF, 0xFFFF, 0xFFFF}, {ID_ZI_J_DOWNKUSA_A, 0xFFFF, 0xFFFF, 0xFFFF},
-                {ID_ZI_J_DASHWTRA_A, ID_ZI_J_DASHWTRA_B, ID_ZI_J_DASHWTRA_C, 0xFFFF}, {dPa_RM(ID_ZI_S_DOWNSAND_A), 0xFFFF, 0xFFFF, 0xFFFF},
-                {dPa_RM(ID_ZI_S_DOWNSNOW_A), dPa_RM(ID_ZI_S_DOWNSNOW_B), 0xFFFF, 0xFFFF}, {dPa_RM(ID_ZI_S_DOWNSMOKE_INWTR_A), 0xFFFF, 0xFFFF, 0xFFFF},
-            };
-            static u16 normalID[6][4] = {
-                {ID_ZI_J_DASHSMOKE_A, 0xFFFF, 0xFFFF, 0xFFFF}, {ID_ZI_J_DASHKUSA_A, 0xFFFF, 0xFFFF, 0xFFFF},
-                {ID_ZI_J_DOWNWTRA_A, ID_ZI_J_DOWNWTRA_B, ID_ZI_J_DOWNWTRA_C, ID_ZI_J_DOWNWTRA_D}, {dPa_RM(ID_ZI_S_DASHSAND_A), 0xFFFF, 0xFFFF, 0xFFFF},
-                {dPa_RM(ID_ZI_S_DASHSNOW_A), dPa_RM(ID_ZI_S_DASHSNOW_B), 0xFFFF, 0xFFFF}, {dPa_RM(ID_ZI_S_DASHSMOKE_INWTR_A), 0xFFFF, 0xFFFF, 0xFFFF},
-            };
-            uVar5 |= bVar3 << (i << 3);
+            uVar5 |= (bVar3 << (i << 3));
             if (bVar3 == 2 && ((param_6 & 0x10000) != 0)) {
                 puVar7 = ringID[bVar3];
                 local_40 = param_2;
@@ -1884,7 +1890,7 @@ u16 dPa_control_c::setCommonPoly(u32* param_0, cBgS_PolyInfo* param_1, cXyz cons
                 }
             }
             ptr = param_0 + 4*i;
-            for ( j = 0; j < 4; j++, ptr++, puVar7++) {
+            for (j = 0; j < 4; j++, ptr++, puVar7++) {
                 if (puVar7[0] == 0xffff) {
                     break;
                 }
@@ -1899,6 +1905,7 @@ u16 dPa_control_c::setCommonPoly(u32* param_0, cBgS_PolyInfo* param_1, cXyz cons
 }
 
 void dPa_wbPcallBack_c::execute(JPABaseEmitter* i_emitter, JPABaseParticle* param_1) {
+    UNUSED(i_emitter);
     JGeometry::TVec3<f32> local_18;
     param_1->getGlobalPosition(local_18);
     cXyz cStack_24(local_18.x, local_18.y, local_18.z);
@@ -1909,8 +1916,10 @@ void dPa_wbPcallBack_c::execute(JPABaseEmitter* i_emitter, JPABaseParticle* para
 }
 
 void dPa_fsenthPcallBack::execute(JPABaseEmitter* i_emitter, JPABaseParticle* param_1) {
-    if (g_env_light.now_senses_effect == 1 && g_env_light.senses_effect_strength > 0.0f) {
-        i_emitter->setGlobalAlpha(255.0f * g_env_light.senses_effect_strength);
+    UNUSED(param_1);
+    dScnKy_env_light_c* envLight = dKy_getEnvlight();
+    if (envLight->now_senses_effect == 1 && envLight->senses_effect_strength > 0.0f) {
+        i_emitter->setGlobalAlpha(255.0f * envLight->senses_effect_strength);
         i_emitter->playDrawParticle();
     } else {
         i_emitter->setGlobalAlpha(0);
@@ -1944,7 +1953,7 @@ void dPa_light8PcallBack::draw(JPABaseEmitter* param_1, JPABaseParticle* param_2
     JGeometry::TVec3<f32> local_118;
     JGeometry::TVec3<f32> local_124;
     JGeometry::TVec3<f32> local_130;
-    u8 globalAlpha = param_1->getGlobalAlpha() & 0xff;
+    u8 globalAlpha = param_1->getGlobalAlpha();
     JGeometry::TVec3<f32> local_13c;
     JGeometry::TVec3<f32> local_148;
     JGeometry::TVec3<f32> local_154;
@@ -2073,7 +2082,7 @@ void dPa_gen_b_light8PcallBack::draw(JPABaseEmitter* param_1, JPABaseParticle* p
     MTXMultVec(j3dSys.getViewMtx(), &local_8c, &local_8c);
     f32 dVar9 = JMASSin(param_2->getRotateAngle());
     f32 dVar10 = JMASCos(param_2->getRotateAngle());
-    param_1->getGlobalParticleScale(local_bc);
+    param_1->getGlobalParticleScale(&local_bc);
     f32 var_f29 = local_bc.x * param_2->getWidth(param_1);
     f32 var_f28 = local_bc.y * param_2->getHeight(param_1);
     local_80[0][0] = dVar10 * var_f29;
@@ -2269,19 +2278,8 @@ void dPa_hermiteEcallBack_c::setOldPosP(cXyz const* param_0, cXyz const* param_1
 
 void dPa_hermiteEcallBack_c::executeAfter(JPABaseEmitter* param_1) {
     JGeometry::TVec3<f32> aTStack_68;
-    #if DEBUG
     JGeometry::TVec3<f32> local_74(field_0x10->x, field_0x10->y, field_0x10->z);
     JGeometry::TVec3<f32> local_80(field_0xc->x, field_0xc->y, field_0xc->z);
-    #else
-    JGeometry::TVec3<f32> local_74;
-    local_74.x = field_0x10->x;
-    local_74.y = field_0x10->y;
-    local_74.z = field_0x10->z;
-    JGeometry::TVec3<f32> local_80;
-    local_80.x = field_0xc->x;
-    local_80.y = field_0xc->y;
-    local_80.z = field_0xc->z;
-    #endif
     JGeometry::TVec3<f32> local_8c;
     JGeometry::TVec3<f32> local_98;
     param_1->setGlobalTranslation(local_80);
@@ -2301,7 +2299,8 @@ void dPa_hermiteEcallBack_c::executeAfter(JPABaseEmitter* param_1) {
         }
         if (fVar1 > 1.0f) {
             f32 dVar9 = 1.0f / fVar1;
-            for (f32 dVar8 = dVar9; dVar8 < 1.0f; dVar8 += dVar9) {
+            f32 dVar8 = dVar9;
+            for (dVar8 = dVar9; dVar8 < 1.0f; dVar8 += dVar9) {
                 aTStack_68.cubic(local_74, local_8c, local_98, local_80, dVar8);
                 JPABaseParticle* particle = param_1->createParticle();
                 if (particle != NULL) {