Make Proc_e enum values consistent across actors

19 files changed, 53 insertions, 51 deletions

diff --git a/include/d/actor/d_a_daiocta.h b/include/d/actor/d_a_daiocta.h
index 5731bdba..e7add783 100644
--- a/include/d/actor/d_a_daiocta.h
+++ b/include/d/actor/d_a_daiocta.h
@@ -21,8 +21,8 @@ public:
     };
 
     enum Proc_e {
-        PROC_INIT = 0,
-        PROC_EXEC = 1
+        PROC_INIT_e = 0,
+        PROC_EXEC_e = 1
     };
 
     enum Mode_e {
diff --git a/include/d/actor/d_a_fm.h b/include/d/actor/d_a_fm.h
index 675079b7..20a4873a 100644
--- a/include/d/actor/d_a_fm.h
+++ b/include/d/actor/d_a_fm.h
@@ -9,13 +9,13 @@
 class daFm_c : public fopEn_enemy_c {
 public:
     enum Proc_e {
-        PROC_0_e,
-        PROC_1_e,
+        PROC_INIT_e = 0,
+        PROC_EXEC_e = 1,
     };
     
-    bool isBodyAppear() {return mMode != 1 && mMode != 0x12 && mMode != 0 && (mMode != 2 && (mMode != 4) && (mMode != 3 && (mMode != 0x11)));}
-    bool isHoleAppear() {return field_0x3E0 > 0.015f;}
-    void modeProcInit(int newMode) {modeProc(PROC_0_e, newMode);}
+    bool isBodyAppear() { return mMode != 1 && mMode != 0x12 && mMode != 0 && (mMode != 2 && (mMode != 4) && (mMode != 3 && (mMode != 0x11))); }
+    bool isHoleAppear() { return field_0x3E0 > 0.015f; }
+    void modeProcInit(int newMode) { modeProc(PROC_INIT_e, newMode); }
 
     void _nodeControl(J3DNode*, J3DModel*);
     BOOL _createHeap();
diff --git a/include/d/actor/d_a_gy_ctrl.h b/include/d/actor/d_a_gy_ctrl.h
index 3c3a0331..081c14e2 100644
--- a/include/d/actor/d_a_gy_ctrl.h
+++ b/include/d/actor/d_a_gy_ctrl.h
@@ -7,8 +7,8 @@
 class daGy_Ctrl_c : public fopAc_ac_c {
 public:
     enum Proc_e {
-        PROC_0_e,
-        PROC_1_e,
+        PROC_INIT_e = 0,
+        PROC_EXEC_e = 1,
     };
 
     void getMode() {}
diff --git a/include/d/actor/d_a_npc_km1.h b/include/d/actor/d_a_npc_km1.h
index 5ae7f16d..d57f35bf 100644
--- a/include/d/actor/d_a_npc_km1.h
+++ b/include/d/actor/d_a_npc_km1.h
@@ -27,14 +27,14 @@ public:
         /* 0x1 */ TEXPATTERN_END,
     };
 
-    s8 getHeadJntNum() {return m_head_jnt_num;}
-    s8 getBackboneJntNum() {return m_backbone_jnt_num;}
-    s16 getBackbone_x() {return m_jnt.getBackbone_x();}
-    s16 getBackbone_y() {return m_jnt.getBackbone_y();}
-    s16 getHead_x() {return m_jnt.getHead_x();}
-    s16 getHead_y() {return m_jnt.getHead_y();}
-    Vec* getAttPos() {return &mAttPos;}
-    Vec* getEyePos() {return &mEyePos;}
+    s8 getHeadJntNum() { return m_head_jnt_num; }
+    s8 getBackboneJntNum()  {return m_backbone_jnt_num; }
+    s16 getBackbone_x() { return m_jnt.getBackbone_x(); }
+    s16 getBackbone_y() { return m_jnt.getBackbone_y(); }
+    s16 getHead_x() { return m_jnt.getHead_x(); }
+    s16 getHead_y() { return m_jnt.getHead_y(); }
+    Vec* getAttPos() { return &mAttPos; }
+    Vec* getEyePos() { return &mEyePos; }
 
     bool createInit();
     void setMtx();
diff --git a/include/d/actor/d_a_npc_ls1.h b/include/d/actor/d_a_npc_ls1.h
index 8074e231..517b171d 100644
--- a/include/d/actor/d_a_npc_ls1.h
+++ b/include/d/actor/d_a_npc_ls1.h
@@ -12,8 +12,8 @@ class daNpc_Ls1_matAnm_c : public J3DMaterialAnm {
 public:
     daNpc_Ls1_matAnm_c();
     void clrMoveFlag() { mbMove = 0; }
-    f32& getNowOffsetX() { return mOffset.x; }
-    f32& getNowOffsetY() { return mOffset.y; }
+    f32* getNowOffsetX() { return &mOffset.x; }
+    f32* getNowOffsetY() { return &mOffset.y; }
     void setMoveFlag() { mbMove = 1; }
 
     void calc(J3DMaterial*) const;
diff --git a/include/d/actor/d_a_npc_nz.h b/include/d/actor/d_a_npc_nz.h
index ced87719..d666e235 100644
--- a/include/d/actor/d_a_npc_nz.h
+++ b/include/d/actor/d_a_npc_nz.h
@@ -14,15 +14,15 @@ class J3DNode;
 class daNpc_Nz_c : public fopNpc_npc_c {
 public:
     enum Proc_e {
-        PROC_INIT = 0,
-        PROC_EXEC = 1,
+        PROC_INIT_e = 0,
+        PROC_EXEC_e = 1,
     };
 
     // objdiff says this is a weak function
     // but defining it here with {} causes it to be inlined with fopAcM_SetupActor which breaks things
     daNpc_Nz_c();
 
-    void modeProcInit(int newMode) { modeProc(PROC_INIT, newMode); }
+    void modeProcInit(int newMode) { modeProc(PROC_INIT_e, newMode); }
 
     BOOL NodeCallBack(J3DNode*, int);
     BOOL TailNodeCallBack(J3DNode*, int);
diff --git a/include/d/actor/d_a_npc_zl1.h b/include/d/actor/d_a_npc_zl1.h
index f8a35227..b40ba1e5 100644
--- a/include/d/actor/d_a_npc_zl1.h
+++ b/include/d/actor/d_a_npc_zl1.h
@@ -9,10 +9,10 @@ class J3DNode;
 
 class daNpc_Zl1_matAnm_c : public J3DMaterialAnm{
 public:
-    void clrMoveFlag() {field_0x7C = false;}
-    f32& getNowOffsetX() {return mOffset.x;}
-    f32& getNowOffsetY() {return mOffset.y;}
-    void setMoveFlag() {field_0x7C = true;}
+    void clrMoveFlag() { field_0x7C = false; }
+    f32* getNowOffsetX() { return &mOffset.x; }
+    f32* getNowOffsetY() { return &mOffset.y; }
+    void setMoveFlag() { field_0x7C = true; }
 
     daNpc_Zl1_matAnm_c();
 
diff --git a/include/d/actor/d_a_obj_canon.h b/include/d/actor/d_a_obj_canon.h
index c22b1dd0..0cbd26ca 100644
--- a/include/d/actor/d_a_obj_canon.h
+++ b/include/d/actor/d_a_obj_canon.h
@@ -13,11 +13,11 @@ class dCcD_SrcSph;
 class daObj_Canon_c : public fopAc_ac_c {
 public:
     enum Proc_e {
-        PROC_INIT = 0,
-        PROC_EXEC = 1
+        PROC_INIT_e = 0,
+        PROC_EXEC_e = 1
     };
 
-    void modeProcInit(int newMode) { modeProc(PROC_INIT, newMode); }
+    void modeProcInit(int newMode) { modeProc(PROC_INIT_e, newMode); }
 
     void _nodeControl(J3DNode*, J3DModel*);
     BOOL _createHeap();
diff --git a/include/d/actor/d_a_obj_hole.h b/include/d/actor/d_a_obj_hole.h
index 4cb1aa28..3379c6bf 100644
--- a/include/d/actor/d_a_obj_hole.h
+++ b/include/d/actor/d_a_obj_hole.h
@@ -8,8 +8,8 @@
 class daObj_Hole_c : public fopAc_ac_c {
 public:
     enum Proc_e {
-        PROC_INIT = 0,
-        PROC_EXEC = 1,
+        PROC_INIT_e = 0,
+        PROC_EXEC_e = 1,
     };
 
     enum Mode {
@@ -20,7 +20,7 @@ public:
 
     static const char m_arc_name[];
 
-    void modeProcInit(int newMode) { modeProc(PROC_INIT, newMode); }
+    void modeProcInit(int newMode) { modeProc(PROC_INIT_e, newMode); }
 
     void setMtx();
     void getPosAndAngle();
diff --git a/include/d/actor/d_a_obj_ikada.h b/include/d/actor/d_a_obj_ikada.h
index ac2bf03f..7b1b556c 100644
--- a/include/d/actor/d_a_obj_ikada.h
+++ b/include/d/actor/d_a_obj_ikada.h
@@ -15,8 +15,8 @@
 class daObj_Ikada_c : public fopAc_ac_c {
 public:
     enum Proc_e {
-        PROC_00_e = 0,
-        PROC_01_e = 1,
+        PROC_INIT_e = 0,
+        PROC_EXEC_e = 1,
     };
 
     void getCranePos() {}
@@ -27,7 +27,7 @@ public:
     bool isCrane() {return mType == 4; }
     bool isFlag() { return mType == 0 || mType == 4; }
     bool isWave() { return mType == 4 || mType == 3 || mType == 1; }
-    void modeProcInit(int idx) { modeProc(PROC_00_e, idx); }
+    void modeProcInit(int idx) { modeProc(PROC_INIT_e, idx); }
     void setInitPos() {}
     void setStart() {}
     void setStop() {}
diff --git a/include/d/actor/d_a_obj_pfall.h b/include/d/actor/d_a_obj_pfall.h
index 71f9d812..173a52f5 100644
--- a/include/d/actor/d_a_obj_pfall.h
+++ b/include/d/actor/d_a_obj_pfall.h
@@ -67,7 +67,7 @@ public:
 class daObj_PfallHIO_c {
 public:
     daObj_PfallHIO_c();
-    virtual ~daObj_PfallHIO_c() {mNo = -1;}
+    virtual ~daObj_PfallHIO_c() { mNo = -1; }
 
 public:
     /* 0x04 */ s8 mNo;
diff --git a/include/d/actor/d_a_obj_toripost.h b/include/d/actor/d_a_obj_toripost.h
index d16a50bb..07dee22c 100644
--- a/include/d/actor/d_a_obj_toripost.h
+++ b/include/d/actor/d_a_obj_toripost.h
@@ -14,8 +14,8 @@ struct daObjTpost_c__letter_data {
 class daObjTpost_c : public fopNpc_npc_c {
 public:
     enum Proc_e {
-        PROC_INIT = 0,
-        PROC_EXEC = 1
+        PROC_INIT_e = 0,
+        PROC_EXEC_e = 1
     };
 
     enum Mode {
@@ -44,7 +44,7 @@ public:
     void eventSet(s8 eventIdx) { mEventIdx = eventIdx; }
     int getSendPrice() { return m_send_price[mPayType]; }
     bool isAnm(s8 idx) { return mAnmPrmIdx == idx; }
-    void modeProcInit(int newMode) { modeProc(PROC_INIT, newMode); }
+    void modeProcInit(int newMode) { modeProc(PROC_INIT_e, newMode); }
 
     BOOL _createHeap();
     void cutProc();
diff --git a/include/d/actor/d_a_obj_warpt.h b/include/d/actor/d_a_obj_warpt.h
index 161ea945..7ae4f2c0 100644
--- a/include/d/actor/d_a_obj_warpt.h
+++ b/include/d/actor/d_a_obj_warpt.h
@@ -12,7 +12,7 @@ class daObj_Warpt_c : public fopAc_ac_c {
 public:
     enum Proc_e {
         PROC_INIT_e,
-        PROC_RUN_e,
+        PROC_EXEC_e,
     };
 
     void modeProcInit(int) {}
diff --git a/include/d/actor/d_a_oship.h b/include/d/actor/d_a_oship.h
index f5ef3f83..0ec3101a 100644
--- a/include/d/actor/d_a_oship.h
+++ b/include/d/actor/d_a_oship.h
@@ -15,8 +15,8 @@
 class daOship_c : public fopAc_ac_c {
 public:
     enum Proc_e {
-        PROC_INIT = 0,
-        PROC_EXEC = 1
+        PROC_INIT_e = 0,
+        PROC_EXEC_e = 1
     };
 
     enum Mode_e {
@@ -40,7 +40,7 @@ public:
 
     u8 getSw() { return mSwitchA; }
     bool isSpecial() { return mModelType != 0xFF || REG12_S(0) != 0; }
-    void modeProcInit(int i_newMode) { modeProc(PROC_INIT, i_newMode); }
+    void modeProcInit(int i_newMode) { modeProc(PROC_INIT_e, i_newMode); }
 
     void _nodeControl(J3DNode*, J3DModel*);
     BOOL _pathMove(cXyz*, cXyz*, cXyz*);
diff --git a/include/d/actor/d_a_rd.h b/include/d/actor/d_a_rd.h
index 7953ab33..d3d1546c 100644
--- a/include/d/actor/d_a_rd.h
+++ b/include/d/actor/d_a_rd.h
@@ -16,8 +16,8 @@ class daRd_c
 {
 public:
     enum Proc_e {
-        PROC_INIT = 0,
-        PROC_EXEC = 1,
+        PROC_INIT_e = 0,
+        PROC_EXEC_e = 1,
     };
     
     enum Mode {
@@ -82,7 +82,7 @@ public:
     void onIkari() { mbIkari = true; }
     void offIkari() { mbIkari = false; }
     bool isIkari() { return mbIkari; }
-    void modeProcInit(int newMode) { modeProc(PROC_INIT, newMode); }
+    void modeProcInit(int newMode) { modeProc(PROC_INIT_e, newMode); }
     
     fopAc_ac_c* _searchNearDeadRd(fopAc_ac_c*);
     void _nodeControl(J3DNode*, J3DModel*);
diff --git a/include/d/actor/d_a_tag_ghostship.h b/include/d/actor/d_a_tag_ghostship.h
index ae928793..4812e107 100644
--- a/include/d/actor/d_a_tag_ghostship.h
+++ b/include/d/actor/d_a_tag_ghostship.h
@@ -6,8 +6,8 @@
 class daTag_Gship_c : public fopAc_ac_c {
 public:
     enum Proc_e {
-        CLEAR_WAIT = 0,
-        CLEAR_EVENT
+        PROC_INIT_e = 0,
+        PROC_EXEC_e = 1,
     };
 
     void modeProcInit(int) {}
diff --git a/include/d/actor/d_a_tsubo.h b/include/d/actor/d_a_tsubo.h
index 6eea0dd9..31be2407 100644
--- a/include/d/actor/d_a_tsubo.h
+++ b/include/d/actor/d_a_tsubo.h
@@ -214,7 +214,7 @@ namespace daTsubo {
         void prm_off_stick() { fopAcM_SetParam(this, fopAcM_GetParam(this) & ~0x80000000); }
         void prm_set_cull_non() { fopAcM_SetParam(this, fopAcM_GetParam(this) & ~0x70000000); }
         void prm_set_itemNo(int) {}
-        void set_drop_spd_y0(f32 drop_speed) {speed.y = drop_speed;}
+        void set_drop_spd_y0(f32 drop_speed) { speed.y = drop_speed; }
         bool spec_chk_prm_boko() const { return prm_get_spec() != 0x3F; }
     
         void prmZ_init();
diff --git a/include/d/d_attention.h b/include/d/d_attention.h
index fdad3161..c8321529 100644
--- a/include/d/d_attention.h
+++ b/include/d/d_attention.h
@@ -258,7 +258,9 @@ public:
     void LookRequest(fopAc_ac_c* reqActor, f32 horizontalDist, f32 upDist, f32 downDist, s16 angle, int param_5) {
         mLook[0].request(reqActor, horizontalDist, upDist, downDist, angle, param_5);
     }
-    void Look2RequestF(fopAc_ac_c* param_1, s16 param_2, int param_3) {mLook[1].requestF(param_1,param_2,param_3);}
+    void Look2RequestF(fopAc_ac_c* param_1, s16 param_2, int param_3) {
+        mLook[1].requestF(param_1,param_2,param_3);
+    }
 
 public:
     /* 0x000 */ fopAc_ac_c* mpPlayer;
diff --git a/include/d/d_bg_s_acch.h b/include/d/d_bg_s_acch.h
index 759ef995..d18bf3b2 100644
--- a/include/d/d_bg_s_acch.h
+++ b/include/d/d_bg_s_acch.h
@@ -209,7 +209,7 @@ public:
     f32 GetCx() { return pm_pos->x; }
     f32 GetCz() { return pm_pos->z; }
 
-    void SetOld() {*pm_old_pos = *pm_pos;}
+    void SetOld() { *pm_old_pos = *pm_pos; }
 
     // TODO
     void ChkGroundAway() {}