diff --git a/src/JSystem/JParticle/JPAEmitter.cpp b/src/JSystem/JParticle/JPAEmitter.cpp
index 265e48c27..62cdda907 100644
--- a/src/JSystem/JParticle/JPAEmitter.cpp
+++ b/src/JSystem/JParticle/JPAEmitter.cpp
@@ -344,7 +344,7 @@ void JPABaseEmitter::calcChild() {
         JPABaseParticle * ptcl = (JPABaseParticle *) link->getObjectPtr();
         ptcl->incFrame();
         if (!ptcl->checkStatus(0x80)) {
-            if ((s32)ptcl->mCurFrame != 0)
+            if (ptcl->getAge() != 0)
                 ptcl->calcVelocity();
             ptcl->calcCB(this);
             if (!ptcl->checkStatus(0x02)) {
diff --git a/src/JSystem/JParticle/JPAParticle.cpp b/src/JSystem/JParticle/JPAParticle.cpp
index 4e227a63a..61a732c74 100644
--- a/src/JSystem/JParticle/JPAParticle.cpp
+++ b/src/JSystem/JParticle/JPAParticle.cpp
@@ -38,7 +38,7 @@ void JPABaseParticle::initParticle() {
     else
         velAxis.zero();
 
-    if (emtr->mInitialVelDir != 0.0f) {
+    if (emtr->mInitialVelDir) {
         Mtx mtx;
         JPAGetYZRotateMtx(emtr->mSpread * emtr->getRandomRF() * 32768.0f, emtr->getRandomSS(), mtx);
         MTXConcat(emtrInfo.mEmitterDirMtx, mtx, mtx);
@@ -48,7 +48,7 @@ void JPABaseParticle::initParticle() {
         velDir.zero();
     }
 
-    if (emtr->mInitialVelRndm != 0.0f) {
+    if (emtr->mInitialVelRndm) {
         velRndm.set(
             emtr->mInitialVelRndm * emtr->getRandomSF(),
             emtr->mInitialVelRndm * emtr->getRandomSF(),
@@ -165,7 +165,7 @@ void JPABaseParticle::incFrame() {
 
     if (mCurFrame >= mLifeTime) {
         mCurNormTime = 1.0f;
-        setStatus(0x02); // setDeleteParticleFlag
+        setStatus(0x02); // setDeleteParticleFlag?
     } else {
         mCurNormTime = mCurFrame / mLifeTime;
     }