e_oc dbg work and cleanup (#2783)

* e_oc dbg work and cleanup

* daE_OC_c::getVisionAngle arg rename

2 files changed, 24 insertions, 33 deletions

diff --git a/include/d/actor/d_a_e_oc.h b/include/d/actor/d_a_e_oc.h
index 584cb98956..6466f0b16d 100644
--- a/include/d/actor/d_a_e_oc.h
+++ b/include/d/actor/d_a_e_oc.h
@@ -4,6 +4,7 @@
 #include "f_op/f_op_actor_mng.h"
 #include "d/d_bg_s_acch.h"
 #include "d/d_cc_d.h"
+#include "d/d_cc_uty.h"
 
 
 /**
@@ -21,16 +22,16 @@ public:
     /* 8072C630 */ int ctrlJoint(J3DJoint*, J3DModel*);
     /* 8072C6E8 */ static int JointCallBack(J3DJoint*, int);
     /* 8072C734 */ int draw();
-    /* 8072CBD4 */ int getVisionAngle(fopAc_ac_c*);
+    /* 8072CBD4 */ s16 getVisionAngle(fopAc_ac_c*);
     /* 8072CC10 */ void searchOtherOc();
-    /* 8072CDA8 */ int setWatchMode();
-    /* 8072CE00 */ int searchPlayer();
-    /* 8072CF90 */ int searchPlayer2();
-    /* 8072D100 */ int searchPlayerShakeHead();
-    /* 8072D1DC */ int searchSound();
+    /* 8072CDA8 */ bool setWatchMode();
+    /* 8072CE00 */ bool searchPlayer();
+    /* 8072CF90 */ bool searchPlayer2();
+    /* 8072D100 */ bool searchPlayerShakeHead();
+    /* 8072D1DC */ bool searchSound();
     /* 8072D364 */ int checkBeforeBg();
-    /* 8072D640 */ int checkBeforeBgFind();
-    /* 8072D87C */ int checkBeforeFloorBg(f32);
+    /* 8072D640 */ bool checkBeforeBgFind();
+    /* 8072D87C */ bool checkBeforeFloorBg(f32);
     /* 8072D994 */ void checkDamageBg();
     /* 8072DB10 */ void setGroundAngle();
     /* 8072DCBC */ void setActionMode(int, int);
@@ -58,7 +59,7 @@ public:
     /* 80731124 */ void executeBigDamage();
     /* 807316F8 */ void executeWatch();
     /* 807319E4 */ void executeSoundWatch();
-    /* 80731D18 */ int checkBeforeDeath();
+    /* 80731D18 */ bool checkBeforeDeath();
     /* 80731D4C */ void executeDeath();
     /* 80731F5C */ void setWaterEffect();
     /* 80732074 */ void executeWaterDeath();
@@ -78,12 +79,12 @@ public:
     /* 80734C10 */ int CreateHeap();
     /* 80734DA8 */ cPhs__Step create();
 
-    u8 isHomeWait() const { return mIsHomeWait; }
-    u8 isBattleOn() const { return mBattleOn; }
-    f32 getMoveRange() const { return mMoveRange; }
-    f32 getPlayerRange() const { return mPlayerRange; }
-    int getActionMode() const { return mActionMode; }
-    daE_OC_c* getTalkOc() const { return mpTalk; }
+    bool isHomeWait() { return mIsHomeWait; }
+    bool isBattleOn() { return mBattleOn; }
+    f32 getMoveRange() { return mMoveRange; }
+    f32 getPlayerRange() { return mPlayerRange; }
+    int getActionMode() { return mActionMode; }
+    daE_OC_c* getTalkOc() { return mpTalk; }
     J3DModel* getOcModel() { return mpMorf->getModel(); }
 
 private:
@@ -96,7 +97,7 @@ private:
     /* 0x670 */ daE_OC_c* mpTalk;
     /* 0x674 */ daE_OC_c* mpParent;
     /* 0x678 */ daRotBridge_c* mpBridge;
-    /* 0x67c */ cXyz field_0x67c;
+    /* 0x67c */ cXyz mWatchPos;
     /* 0x688 */ csXyz field_0x688;
     /* 0x690 */ f32 mMoveRange;
     /* 0x690 */ f32 mPlayerRange;
@@ -129,7 +130,7 @@ private:
     /* 0x6dd */ u8 field_0x6dd;
     /* 0x6de */ u8 field_0x6de;
     /* 0x6df */ u8 field_0x6df;
-    /* 0x6e0 */ u8 field_0x6e0;
+    /* 0x6e0 */ u8 mDefeatedSwitch;
     /* 0x6e1 */ u8 field_0x6e1;
     /* 0x6e2 */ u8 field_0x6e2;
     /* 0x6e3 */ u8 field_0x6e3;
@@ -137,7 +138,7 @@ private:
     /* 0x6e8 */ u8 field_0x6e8;
     /* 0x6e9 */ u8 mIsHomeWait;
     /* 0x6ea */ u8 mBattleOn;
-    /* 0x6eb */ u8 field_0x6eb;
+    /* 0x6eb */ bool mHide;
     /* 0x6ec */ cXyz mPlayerPos;
     /* 0x6f8 */ cXyz field_0x6f8;
     /* 0x704 */ f32 field_0x704;
@@ -146,21 +147,11 @@ private:
     /* 0x920 */ dCcD_Stts mStts;
     /* 0x95c */ dCcD_Sph mSphs_cc[2];
     /* 0xbcc */ dCcD_Sph mSphs_at[2];
-    /* 0xe3c */ cCcD_Obj* mpTgHitObj;
-    /* 0xe40 */ u8 field_0xe40[0xe44 - 0xe40];
-    /* 0xe44 */ Z2CreatureEnemy* mpSound;
-    /* 0xe48 */ u8 field_0xe48[0xe4a - 0xe48];
-    /* 0xe4a */ s16 field_0xe4a;
-    /* 0xe4c */ u8 field_0xe4c[0xe58 - 0xe4c];
-    /* 0xe58 */ u16 field_0xe58;
-    /* 0xe5a */ u8 field_0xe5a;
-    /* 0xe5b */ u8 field_0xe5b; // might be unused.
-    /* 0xe5c */ u8 field_0xe5c[0xe60 - 0xe5c];
+    /* 0xe3c */ dCcU_AtInfo mAtInfo;
     /* 0xe60 */ u32 field_0xe60;
     /* 0xe64 */ u32 field_0xe64;
-    /* 0xe68 */ u32 mParticleKey;
-    /* 0xe6c */ u32 field_0xe6c;
-    /* 0xe70 */ u32 field_0xe70[4];
+    /* 0xe68 */ u32 mParticleKeys[2];
+    /* 0xe70 */ u32 mWaterEffects[4];
     /* 0xe80 */ u32 mRippleKey;
     /* 0xe84 */ u8 field_0xe84;
 };
diff --git a/include/d/actor/d_a_obj_rotBridge.h b/include/d/actor/d_a_obj_rotBridge.h
index 4f518b0ce2..a0b674d3e6 100644
--- a/include/d/actor/d_a_obj_rotBridge.h
+++ b/include/d/actor/d_a_obj_rotBridge.h
@@ -26,8 +26,8 @@ public:
     /* 80CBF404 */ virtual int Draw();
     /* 80CBF4BC */ virtual int Delete();
 
-    u8 getPlayerRide() const { return mIsPlayerRide; }
-    u8 getBridgeAngle() const { return mBridgeAngle; }
+    u8 getPlayerRide() { return mIsPlayerRide; }
+    u8 getBridgeAngle() { return mBridgeAngle; }
 
     /* 0x5A0 */ request_of_phase_process_class mPhase;
     /* 0x5A8 */ J3DModel* mpModel;