From 10b0558a8448ae0990af5d042265fd1e41d38598 Mon Sep 17 00:00:00 2001
From: LagoLunatic <LagoLunatic@users.noreply.github.com>
Date: Tue, 26 Aug 2025 13:38:05 -0400
Subject: [PATCH] Minor cleanup

---
 include/d/actor/d_a_ykgr.h       |  4 ++--
 src/d/actor/d_a_canon.cpp        | 12 ++++++------
 src/d/actor/d_a_himo2.cpp        |  8 +++-----
 src/d/actor/d_a_obj_shmrgrd.cpp  |  2 +-
 src/d/actor/d_a_obj_smplbg.cpp   |  2 +-
 src/d/actor/d_a_obj_swhammer.cpp |  2 +-
 6 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/include/d/actor/d_a_ykgr.h b/include/d/actor/d_a_ykgr.h
index aa6f7ac8b..25c1dc9eb 100644
--- a/include/d/actor/d_a_ykgr.h
+++ b/include/d/actor/d_a_ykgr.h
@@ -41,7 +41,7 @@ public:
         if (m_emitter == NULL) {
             return;
         }
-        m_emitter->setStatus(JPAEmtrStts_StopDraw);
+        m_emitter->stopDrawParticle();
         return;
     }
     void setAimRate(float) {}
@@ -51,7 +51,7 @@ public:
         if (m_emitter == NULL) {
             return;
         }
-        m_emitter->clearStatus(JPAEmtrStts_StopDraw);
+        m_emitter->playDrawParticle();
         return;
     }
     void start() {
diff --git a/src/d/actor/d_a_canon.cpp b/src/d/actor/d_a_canon.cpp
index 05fec7f1d..f54f409ec 100644
--- a/src/d/actor/d_a_canon.cpp
+++ b/src/d/actor/d_a_canon.cpp
@@ -5,11 +5,11 @@
 
 #include "d/dolzel_rel.h" // IWYU pragma: keep
 #include "d/actor/d_a_canon.h"
-#include "/d/actor/d_a_npc_kg2.h"
-#include "/d/actor/d_a_player.h"
-#include "/d/actor/d_a_bomb.h"
-#include "/d/actor/d_a_sea.h"
-#include "/d/res/res_bomber.h"
+#include "d/actor/d_a_npc_kg2.h"
+#include "d/actor/d_a_player.h"
+#include "d/actor/d_a_bomb.h"
+#include "d/actor/d_a_sea.h"
+#include "d/res/res_bomber.h"
 #include "m_Do/m_Do_ext.h"
 #include "d/d_procname.h"
 #include "d/d_2dnumber.h"
@@ -645,7 +645,7 @@ static BOOL daCanonDelete(void* i_this) {
 
 bool daCanon_c::_execute() {
     if (m664) {
-        dKy_actor_addcol_set(0, 0, 0, 0.0);
+        dKy_actor_addcol_set(0, 0, 0, 0.0f);
         dKy_efplight_cut(&plight);
         dKyw_pntwind_cut(&pwind);
         m664 = false;
diff --git a/src/d/actor/d_a_himo2.cpp b/src/d/actor/d_a_himo2.cpp
index 73ba658a4..95e3538df 100644
--- a/src/d/actor/d_a_himo2.cpp
+++ b/src/d/actor/d_a_himo2.cpp
@@ -1762,12 +1762,10 @@ static cPhs_State daHimo2_Create(fopAc_ac_c* i_this) {
                 /* SrcGObjCo SPrm    */ 0,
             },
             // cM3dGSphS
-            {
-                /* Center */ 0.0f,
-                0.0f,
-                0.0f,
+            {{
+                /* Center */ {0.0f, 0.0f, 0.0f},
                 /* Radius */ 20.0f,
-            },
+            }},
         };
         a_this->m2014.Init(0xFF, 0xFF, a_this);
         a_this->m2050.Set(sph_src);
diff --git a/src/d/actor/d_a_obj_shmrgrd.cpp b/src/d/actor/d_a_obj_shmrgrd.cpp
index f725e4a88..824ca4053 100644
--- a/src/d/actor/d_a_obj_shmrgrd.cpp
+++ b/src/d/actor/d_a_obj_shmrgrd.cpp
@@ -35,7 +35,7 @@ const Attr_c L_attr = {
     /* mCrushDuration     */ 18,
     /* m1C                */ 0.0f, 
     /* m20                */ 0.8f,
-    /* m24                */ 0.45f
+    /* m24                */ 0.45f,
 };
 
 inline const Attr_c & attr() { return L_attr; }
diff --git a/src/d/actor/d_a_obj_smplbg.cpp b/src/d/actor/d_a_obj_smplbg.cpp
index 0ec977336..7e45302b0 100644
--- a/src/d/actor/d_a_obj_smplbg.cpp
+++ b/src/d/actor/d_a_obj_smplbg.cpp
@@ -23,7 +23,7 @@ const daObjSmplbg::Act_c::Attr_c daObjSmplbg::Act_c::M_attr[] = {
     /* mCullMaxX     */ 750,
     /* mCullMaxY     */ 0,
     /* mCullMaxZ     */ 0,
-    /* mEyeOffset    */ 1687.0f
+    /* mEyeOffset    */ 1687.0f,
 };
 
 Mtx daObjSmplbg::Act_c::M_tmp_mtx;
diff --git a/src/d/actor/d_a_obj_swhammer.cpp b/src/d/actor/d_a_obj_swhammer.cpp
index 8ca9c0c15..cb4842f9f 100644
--- a/src/d/actor/d_a_obj_swhammer.cpp
+++ b/src/d/actor/d_a_obj_swhammer.cpp
@@ -36,7 +36,7 @@ namespace daObjSwhammer {
             /* mCrushDuration     */ 18,
             /* mUncrushSpeed0     */ 0.0f,
             /* mUncrushSpring     */ 0.8f,
-            /* mUncrushSpeedDecay */ 0.45f
+            /* mUncrushSpeedDecay */ 0.45f,
         };
 
         inline const Attr_c & attr() { return L_attr; }