d_a_obj_cboard / finish f_op_actor / rels cleanup (#268)

* d_a_obj_cboard / finish f_op_actor / clean up some rel files

* rename some actor vars / remove asm

* progress

3 files changed, 23 insertions, 13 deletions

diff --git a/include/d/a/d_a_player.h b/include/d/a/d_a_player.h
index f48e1abd10..32ec70e407 100644
--- a/include/d/a/d_a_player.h
+++ b/include/d/a/d_a_player.h
@@ -311,9 +311,12 @@ public:
         ERFLG0_UNK_2000 = 0x2000,
         ERFLG0_UNK_1000 = 0x1000,
         ERFLG0_UNK_400 = 0x400,
+        ERFLG0_FORCE_AUTO_JUMP = 0x200,
         ERFLG0_UNK_100 = 0x100,
         ERFLG0_UNK_80 = 0x80,
         ERFLG0_UNK_40 = 0x40,
+        ERFLG0_NOT_AUTO_JUMP = 0x20,
+        ERFLG0_NOT_HANG = 0x10,
         ERFLG0_UNK_8 = 8,
         ERFLG0_UNK_4 = 4,
         ERFLG0_UNK_2 = 2,
@@ -695,6 +698,10 @@ public:
     bool checkSceneChangeAreaStart() const { return i_checkNoResetFlg2(FLG2_SCN_CHG_START); }
     bool checkFrontRollCrash() const { return i_checkResetFlg0(RFLG0_FRONT_ROLL_CRASH); }
     
+    void onForceAutoJump() { i_onEndResetFlg0(ERFLG0_FORCE_AUTO_JUMP); }
+    void onNotAutoJump() { i_onEndResetFlg0(ERFLG0_NOT_AUTO_JUMP); }
+    void onNotHang() { i_onEndResetFlg0(ERFLG0_NOT_HANG); }
+    
     void offGoronSideMove() {
         if (i_checkGoronSideMove()) {
             mSpecialMode = 0;
diff --git a/include/d/bg/d_bg_s_movebg_actor.h b/include/d/bg/d_bg_s_movebg_actor.h
index 2eacdec49e..3321d77db9 100644
--- a/include/d/bg/d_bg_s_movebg_actor.h
+++ b/include/d/bg/d_bg_s_movebg_actor.h
@@ -10,25 +10,24 @@ typedef void (*MoveBGActor_SetFunc)(dBgW*, void*, cBgS_PolyInfo const&, bool, cX
                                     csXyz*);
 
 class dBgS_MoveBgActor : public fopAc_ac_c {
-private:
+public:
     /* 0x568 */ dBgW* field_0x568;
     /* 0x56C */ Mtx field_0x56c;
 
-public:
     /* 80078624 */ dBgS_MoveBgActor();
     /* 800786C8 */ int MoveBGCreateHeap();
     /* 800787BC */ int MoveBGCreate(char const*, int, MoveBGActor_SetFunc, u32, Mtx*);
-    /* 800788DC */ bool MoveBGDelete();
-    /* 80078950 */ bool MoveBGExecute();
+    /* 800788DC */ int MoveBGDelete();
+    /* 80078950 */ int MoveBGExecute();
 
-    /* 80078688 */ virtual s32 CreateHeap();
-    /* 80078690 */ virtual bool Create();
-    /* 80078698 */ virtual bool Execute(f32 (**)[3][4]);
-    /* 800786A0 */ virtual bool Draw();
-    /* 800786A8 */ virtual bool Delete();
-    /* 800786B0 */ virtual bool IsDelete();
-    /* 800786B8 */ virtual bool ToFore();
-    /* 800786C0 */ virtual bool ToBack();
+    /* 80078688 */ virtual int CreateHeap();
+    /* 80078690 */ virtual int Create();
+    /* 80078698 */ virtual int Execute(f32 (**)[3][4]);
+    /* 800786A0 */ virtual int Draw();
+    /* 800786A8 */ virtual int Delete();
+    /* 800786B0 */ virtual int IsDelete();
+    /* 800786B8 */ virtual int ToFore();
+    /* 800786C0 */ virtual int ToBack();
 
     static const char* m_name;
     static int m_dzb_id;
diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h
index 85a7ab14a8..e520e4639b 100644
--- a/include/d/com/d_com_inf_game.h
+++ b/include/d/com/d_com_inf_game.h
@@ -6,6 +6,7 @@
 #include "d/cc/d_cc_s.h"
 #include "d/d_attention.h"
 #include "d/d_drawlist.h"
+#include "d/d_procname.h"
 #include "d/d_resorce.h"
 #include "d/d_simple_model.h"
 #include "d/d_stage.h"
@@ -14,7 +15,6 @@
 #include "d/event/d_event_manager.h"
 #include "d/particle/d_particle.h"
 #include "d/save/d_save.h"
-#include "dolphin/types.h"
 #include "f_op/f_op_camera_mng.h"
 #include "f_op/f_op_scene_mng.h"
 
@@ -790,6 +790,10 @@ inline u8 dComIfG_getBrightness() {
     return g_dComIfG_gameInfo.mFadeBrightness;
 }
 
+inline int dComIfG_getObjctResName2Index(const char* i_arcName, const char* i_resName) {
+    return g_dComIfG_gameInfo.mResControl.getObjectResName2Index(i_arcName, i_resName);
+}
+
 u8 dComIfGs_getMixItemIndex(int i_no);
 void dComIfGs_setSelectItemIndex(int i_no, u8 item_index);
 void dComIfGs_setMixItemIndex(int i_no, u8 item_index);