From 14d71dae68f88d91aaeeff01c979dac5f939a056 Mon Sep 17 00:00:00 2001
From: LagoLunatic <LagoLunatic@users.noreply.github.com>
Date: Tue, 7 Nov 2023 17:54:55 -0500
Subject: [PATCH] match 3 JPA TUs

---
 configure.py                                 |  6 +++---
 include/JSystem/JGeometry.h                  |  8 ++------
 include/JSystem/JParticle/JPADynamicsBlock.h | 12 ++++++------
 include/JSystem/JParticle/JPAFieldBlock.h    |  6 +++---
 src/JSystem/JParticle/JPAExtraShape.cpp      | 10 +++-------
 5 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/configure.py b/configure.py
index 9c6ddfb12..b65e75a3c 100644
--- a/configure.py
+++ b/configure.py
@@ -560,11 +560,11 @@ config.libs = [
         "JParticle",
         [
             Object(NonMatching, "JSystem/JParticle/JPABaseShape.cpp"),
-            Object(NonMatching, "JSystem/JParticle/JPAExtraShape.cpp"),
+            Object(Matching,    "JSystem/JParticle/JPAExtraShape.cpp"),
             Object(Matching,    "JSystem/JParticle/JPASweepShape.cpp"),
             Object(Matching,    "JSystem/JParticle/JPAExTexShape.cpp"),
-            Object(NonMatching, "JSystem/JParticle/JPADynamicsBlock.cpp"),
-            Object(NonMatching, "JSystem/JParticle/JPAFieldBlock.cpp"),
+            Object(Matching,    "JSystem/JParticle/JPADynamicsBlock.cpp"),
+            Object(Matching,    "JSystem/JParticle/JPAFieldBlock.cpp"),
             Object(Matching,    "JSystem/JParticle/JPAKeyBlock.cpp"),
             Object(Matching,    "JSystem/JParticle/JPATexture.cpp"),
             Object(NonMatching, "JSystem/JParticle/JPAResourceManager.cpp"),
diff --git a/include/JSystem/JGeometry.h b/include/JSystem/JGeometry.h
index 5b6e739cf..000f09ea8 100644
--- a/include/JSystem/JGeometry.h
+++ b/include/JSystem/JGeometry.h
@@ -25,9 +25,7 @@ struct TVec3<s16> {
     s16 x, y, z;
 
     TVec3& operator=(const TVec3& b) {
-        x = b.x;
-        y = b.y;
-        z = b.z;
+        set(b.x, b.y, b.z);
         return *this;
     }
 
@@ -142,9 +140,7 @@ struct TVec3<f32> {
     // }
 
     inline TVec3<f32>& operator=(const TVec3<f32>& b) {
-        x = b.x;
-        y = b.y;
-        z = b.z;
+        set(b.x, b.y, b.z);
         return *this;
     }
 
diff --git a/include/JSystem/JParticle/JPADynamicsBlock.h b/include/JSystem/JParticle/JPADynamicsBlock.h
index b79257f34..fc7f383fd 100644
--- a/include/JSystem/JParticle/JPADynamicsBlock.h
+++ b/include/JSystem/JParticle/JPADynamicsBlock.h
@@ -44,6 +44,12 @@ public:
     virtual void getEmitterRot(JGeometry::TVec3<s16>&) = 0;
     virtual void getEmitterTrs(JGeometry::TVec3<f32>&) = 0;
     virtual void getEmitterDir(JGeometry::TVec3<f32>&) = 0;
+    virtual f32 getInitVelOmni() = 0;
+    virtual f32 getInitVelAxis() = 0;
+    virtual f32 getInitVelRndm() = 0;
+    virtual f32 getInitVelDir() = 0;
+    virtual f32 getSpread() = 0;
+    virtual f32 getInitVelRatio() = 0;
     virtual u32 getVolumeType() = 0;
     virtual u32 getVolumeSize() = 0;
     virtual f32 getVolumeSweep() = 0;
@@ -56,12 +62,6 @@ public:
     virtual u32 getStartFrame() = 0;
     virtual u32 getLifeTime() = 0;
     virtual f32 getLifeTimeRndm() = 0;
-    virtual f32 getInitVelOmni() = 0;
-    virtual f32 getInitVelAxis() = 0;
-    virtual f32 getInitVelRndm() = 0;
-    virtual f32 getInitVelDir() = 0;
-    virtual f32 getSpread() = 0;
-    virtual f32 getInitVelRatio() = 0;
     virtual f32 getAccel() = 0;
     virtual f32 getAccelRndm() = 0;
     virtual f32 getAirResist() = 0;
diff --git a/include/JSystem/JParticle/JPAFieldBlock.h b/include/JSystem/JParticle/JPAFieldBlock.h
index 646e5731d..850ae6f70 100644
--- a/include/JSystem/JParticle/JPAFieldBlock.h
+++ b/include/JSystem/JParticle/JPAFieldBlock.h
@@ -24,10 +24,10 @@ class JPAFieldBlock {
 public:
     virtual ~JPAFieldBlock() {}
     virtual u32 getType() = 0;
-    virtual u32 getVelType() = 0;
-    virtual u32 getSttFlag() = 0;
-    virtual u32 getCycle() = 0;
     virtual u32 getID() = 0;
+    virtual u32 getVelType() = 0;
+    virtual u32 getCycle() = 0;
+    virtual u32 getSttFlag() = 0;
     virtual void getPos(JGeometry::TVec3<float>&) = 0;
     virtual void getDir(JGeometry::TVec3<float>&) = 0;
     virtual f32 getMag() = 0;
diff --git a/src/JSystem/JParticle/JPAExtraShape.cpp b/src/JSystem/JParticle/JPAExtraShape.cpp
index 3bfd8c01d..03ad77569 100644
--- a/src/JSystem/JParticle/JPAExtraShape.cpp
+++ b/src/JSystem/JParticle/JPAExtraShape.cpp
@@ -10,13 +10,9 @@
 JPAExtraShapeArc::JPAExtraShapeArc(const u8* data) {
     mpData = reinterpret_cast<const JPAExtraShapeData*>(data+0x0C);
 
-    if (mpData->mAlphaInTiming != 0.0f) {
-        mAlphaIncreaseRate = (mpData->mAlphaBaseValue - mpData->mAlphaInValue) / mpData->mAlphaInTiming;
-    }
+    mAlphaIncreaseRate = mpData->mAlphaInTiming != 0.0f ? (mpData->mAlphaBaseValue - mpData->mAlphaInValue) / mpData->mAlphaInTiming : 1.0f;
 
-    if (mpData->mAlphaOutTiming != 1.0f) {
-        mAlphaDecreaseRate = (mpData->mAlphaOutValue - mpData->mAlphaBaseValue) / (1.0f - mpData->mAlphaOutTiming);
-    }
+    mAlphaDecreaseRate = mpData->mAlphaOutTiming != 1.0f ? (mpData->mAlphaOutValue - mpData->mAlphaBaseValue) / (1.0f - mpData->mAlphaOutTiming) : 1.0f;
 
     if (mpData->mScaleInTiming != 0.0f) {
         mIncreaseRateX = (1.0f - mpData->mScaleInValueX) / mpData->mScaleInTiming;
@@ -26,7 +22,7 @@ JPAExtraShapeArc::JPAExtraShapeArc(const u8* data) {
         mIncreaseRateX = 1.0f;
     }
 
-    if (mpData->mScaleOutTiming != 0.0f) {
+    if (mpData->mScaleOutTiming != 1.0f) {
         mDecreaseRateX = (mpData->mScaleOutValueX - 1.0f) / (1.0f - mpData->mScaleOutTiming);
         mDecreaseRateY = (mpData->mScaleOutValueY - 1.0f) / (1.0f - mpData->mScaleOutTiming);
     } else {