e_ym / obj_volcball wip. obj_mgate done (#318)

* e_ym / obj_volcball wip. obj_mgate done

* remove asm

---------

Co-authored-by: root <root@DESKTOP-BTVP2BC>

7 files changed, 18 insertions, 5 deletions

diff --git a/include/d/a/d_a_player.h b/include/d/a/d_a_player.h
index 229859b2e3..34b0ea5b88 100644
--- a/include/d/a/d_a_player.h
+++ b/include/d/a/d_a_player.h
@@ -377,6 +377,7 @@ public:
     enum daPy_RFLG1 {
         RFLG1_UNK_30 = 0x30,
         RFLG1_UNK_2 = 0x2,
+        RFLG1_WOLF_ATTACK_REVERSE = 0x1,
     };
 
     enum {
@@ -450,7 +451,7 @@ public:
     static BOOL checkMasterSwordEquip();
     static BOOL checkWoodShieldEquip();
     static f32 getAttentionOffsetY();
-    s16 checkNowWolfEyeUp();
+    static int checkNowWolfEyeUp();
     static void forceRestartRoom(int, u32, int);
     static void setFmChainPos(fopAc_ac_c*, cXyz*, int);
     static void cancelFmChainGrab();
@@ -709,6 +710,7 @@ public:
     bool checkWaterInMove() const { return i_checkNoResetFlg0(FLG0_UNDERWATER); }
     bool checkSceneChangeAreaStart() const { return i_checkNoResetFlg2(FLG2_SCN_CHG_START); }
     bool checkFrontRollCrash() const { return i_checkResetFlg0(RFLG0_FRONT_ROLL_CRASH); }
+    bool checkWolfAttackReverse() const { return checkResetFlg1(RFLG1_WOLF_ATTACK_REVERSE); }
     
     void onForceAutoJump() { i_onEndResetFlg0(ERFLG0_FORCE_AUTO_JUMP); }
     void onNotAutoJump() { i_onEndResetFlg0(ERFLG0_NOT_AUTO_JUMP); }
@@ -749,6 +751,7 @@ public:
     void i_offEndResetFlg2(daPy_ERFLG2 flag) { mEndResetFlg2 &= ~flag; }
     
     int i_checkResetFlg0(daPy_py_c::daPy_RFLG0 flag) const { return mResetFlg0 & flag; }
+    int checkResetFlg1(daPy_py_c::daPy_RFLG1 flag) const { return mResetFlg1 & flag; }
     
     int i_checkEndResetFlg0(daPy_py_c::daPy_ERFLG0 flag) const { return mEndResetFlg0 & flag; }
     int i_checkEndResetFlg1(daPy_py_c::daPy_ERFLG1 flag) const { return mEndResetFlg1 & flag; }
diff --git a/include/d/bg/d_bg_s.h b/include/d/bg/d_bg_s.h
index 9e8ca34a97..b2a7e66f56 100644
--- a/include/d/bg/d_bg_s.h
+++ b/include/d/bg/d_bg_s.h
@@ -112,7 +112,7 @@ bool dBgS_CheckBWallPoly(cBgS_PolyInfo const&);
 void dBgS_MoveBGProc_Typical(dBgW* param_0, void* param_1, cBgS_PolyInfo const& param_2,
                              bool param_3, cXyz* param_4, csXyz* param_5, csXyz* param_6);
 void dBgS_MoveBGProc_TypicalRotY(dBgW* param_0, void* param_1, cBgS_PolyInfo const& param_2,
-                             bool param_3, cXyz* param_4, csXyz* param_5, csXyz* param_6);
+                                 bool param_3, cXyz* param_4, csXyz* param_5, csXyz* param_6);
 f32 dBgS_GetNY(cBgS_PolyInfo const& poly);
 
 #endif /* D_BG_D_BG_S_H */
diff --git a/include/d/bg/d_bg_s_movebg_actor.h b/include/d/bg/d_bg_s_movebg_actor.h
index 3321d77db9..5393f1dff1 100644
--- a/include/d/bg/d_bg_s_movebg_actor.h
+++ b/include/d/bg/d_bg_s_movebg_actor.h
@@ -20,6 +20,8 @@ public:
     /* 800788DC */ int MoveBGDelete();
     /* 80078950 */ int MoveBGExecute();
 
+    int MoveBGDraw() { return Draw(); }
+
     /* 80078688 */ virtual int CreateHeap();
     /* 80078690 */ virtual int Create();
     /* 80078698 */ virtual int Execute(f32 (**)[3][4]);
diff --git a/include/d/d_lib.h b/include/d/d_lib.h
index 7a54285045..3c8f01c5cf 100644
--- a/include/d/d_lib.h
+++ b/include/d/d_lib.h
@@ -1,12 +1,14 @@
 #ifndef D_D_LIB_H
 #define D_D_LIB_H
 
-#include "dolphin/types.h"
-#include "dolphin/os/OS.h"
 #include "dolphin/mtx/quat.h"
+#include "dolphin/os/OS.h"
+#include "f_op/f_op_actor.h"
 
 struct JKRAramArchive;
 u32 dLib_getExpandSizeFromAramArchive(JKRAramArchive* arc, char const* resName);
+BOOL dLib_checkActorInRectangle(fopAc_ac_c* param_0, fopAc_ac_c* param_1, cXyz const* param_2,
+                                cXyz const* param_3);
 
 struct STControl {
     STControl() {
diff --git a/include/d/d_vibration.h b/include/d/d_vibration.h
index 140b1b7189..26543a574a 100644
--- a/include/d/d_vibration.h
+++ b/include/d/d_vibration.h
@@ -13,7 +13,7 @@ public:
     /* 8006FB10 */ bool StartQuake(int, int, cXyz);
     /* 8006FD94 */ int StopQuake(int);
     /* 8006FE00 */ void Kill();
-    /* 8006FE5C */ int CheckQuake();
+    /* 8006FE5C */ bool CheckQuake();
     /* 8006FE84 */ void setDefault();
     /* 8006FF04 */ void Init();
     /* 8006FF38 */ void Pause();
diff --git a/include/d/event/d_event_lib.h b/include/d/event/d_event_lib.h
index 48728cb2e8..5019a47c0a 100644
--- a/include/d/event/d_event_lib.h
+++ b/include/d/event/d_event_lib.h
@@ -21,6 +21,11 @@ struct action_class {
 };
 
 struct dEvLib_callback_c {
+    dEvLib_callback_c(fopAc_ac_c* param_0) {
+        mActor = param_0;
+        mAction = NULL;
+    }
+
     /* 8004886C */ BOOL eventUpdate();
     /* 800488A4 */ BOOL setEvent(int, int, int);
     /* 80048940 */ void orderEvent(int, int, int);
diff --git a/include/d/particle/d_particle.h b/include/d/particle/d_particle.h
index 52167cba2b..8a7737559c 100644
--- a/include/d/particle/d_particle.h
+++ b/include/d/particle/d_particle.h
@@ -58,6 +58,7 @@ public:
 class dPa_followEcallBack : public dPa_levelEcallBack {
 public:
     /* 80049580 */ dPa_followEcallBack(u8, u8);
+    /* 80D22230 */ void __defctor();  // compiler generated
 
     /* 80050200 */ virtual ~dPa_followEcallBack();
     /* 800495BC */ virtual void execute(JPABaseEmitter*);