Merge remote-tracking branch 'upstream/main'

3 files changed, 8 insertions, 8 deletions

diff --git a/src/d/actor/d_a_mgameboard.cpp b/src/d/actor/d_a_mgameboard.cpp
index 5c61997f..42f1c0a4 100644
--- a/src/d/actor/d_a_mgameboard.cpp
+++ b/src/d/actor/d_a_mgameboard.cpp
@@ -3,7 +3,7 @@
 // Translation Unit: d_a_mgameboard.cpp
 //
 
-#include "d_a_mgameboard.h"
+#include "d/actor/d_a_mgameboard.h"
 #include "dolphin/types.h"
 
 /* 000000EC-0000010C       .text CheckCreateHeap__FP10fopAc_ac_c */
diff --git a/src/d/actor/d_a_obj_Ygush00.cpp b/src/d/actor/d_a_obj_Ygush00.cpp
index de58d71f..f7359fe7 100644
--- a/src/d/actor/d_a_obj_Ygush00.cpp
+++ b/src/d/actor/d_a_obj_Ygush00.cpp
@@ -128,7 +128,7 @@ bool daObjYgush00_c::_execute() {
                 fopAcM_seStartCurrent(this, 0x61fe, 0);
             }
         } else {
-            mpGryw00 = (daObjGryw00_c*)i_fopAcM_SearchByName(PROC_Obj_Gryw00);
+            mpGryw00 = (daObjGryw00_c*)fopAcM_SearchByName(PROC_Obj_Gryw00);
         }
     } else {
         fopAcM_seStartCurrent(this, 0x61fe, 0);
diff --git a/src/d/actor/d_a_obj_movebox.cpp b/src/d/actor/d_a_obj_movebox.cpp
index 9c2a226f..4f64281d 100644
--- a/src/d/actor/d_a_obj_movebox.cpp
+++ b/src/d/actor/d_a_obj_movebox.cpp
@@ -127,12 +127,12 @@ namespace daObjMovebox {
         s32 prm_get_buoy() const { return daObj::PrmAbstract(this, PRM_BUOY_W, PRM_BUOY_S); }
         s32 prm_get_dmy() const; // Unused?
         
-        BOOL is_switch1() const { return fopAcM_isSwitch(this, prm_get_swSave1()); };
-        BOOL is_switch2() const { return fopAcM_isSwitch(this, prmZ_get_swSave2()); };
-        void on_switch1() const { fopAcM_onSwitch(this, prm_get_swSave1()); };
-        void on_switch2() const { fopAcM_onSwitch(this, prmZ_get_swSave2()); };
-        void off_switch1() const { fopAcM_offSwitch(this, prm_get_swSave1()); };
-        void off_switch2() const { fopAcM_offSwitch(this, prmZ_get_swSave2()); };
+        BOOL is_switch1() const { return fopAcM_isSwitch((Act_c*)this, prm_get_swSave1()); };
+        BOOL is_switch2() const { return fopAcM_isSwitch((Act_c*)this, prmZ_get_swSave2()); };
+        void on_switch1() const { fopAcM_onSwitch((Act_c*)this, prm_get_swSave1()); };
+        void on_switch2() const { fopAcM_onSwitch((Act_c*)this, prmZ_get_swSave2()); };
+        void off_switch1() const { fopAcM_offSwitch((Act_c*)this, prm_get_swSave1()); };
+        void off_switch2() const { fopAcM_offSwitch((Act_c*)this, prmZ_get_swSave2()); };
         
         void prmZ_init();
         void prmX_init();