Lv4railwall / lv4sand / lv4slidewall done. fix wii build (#2637)

* lv4railwall / lv4sand / lv4slidewall done and wii build fix

* fix Mtx** parameters

* add some notes about wii compiler version

* Remove dol2asm include

---------

Co-authored-by: hatal175 <hatal175@users.noreply.github.com>

config/RZDE01_00/config.yml

@@ -4641,13 +4641,13 @@ modules:
   splits: config/RZDE01_00/rels/d_a_warp_bug/splits.txt
 # map: orig/RZDE01_00/fixed_maps/d_a_warp_bug.map
 
-# extract:
-# - symbol: black_tex
-#   binary: assets/black_tex.bin
-#   header: assets/black_tex.h
-# - symbol: msg_data
-#   binary: assets/msg_data.bin
-#   header: assets/msg_data.h
-# - symbol: font_data
-#   binary: assets/font_data.bin
-#   header: assets/font_data.h
+extract:
+- symbol: black_tex
+  binary: assets/black_tex.bin
+  header: assets/black_tex.h
+- symbol: msg_data
+  binary: assets/msg_data.bin
+  header: assets/msg_data.h
+- symbol: font_data
+  binary: assets/font_data.bin
+  header: assets/font_data.h

config/RZDE01_00/symbols.txt

@@ -18600,6 +18600,7 @@ m_hitSeID__12dCcD_GObjInf = .rodata:0x803D0E30; // type:object size:0x60 scope:g
 @112851 = .rodata:0x803D1164; // type:object size:0x10 scope:local align:4 data:4byte
 lbl_803D1178 = .rodata:0x803D1178; // type:object size:0x28
 ...rodata.0 = .rodata:0x803D11A0; // type:label scope:local align:4
+black_tex = .rodata:0x803D11A0; // type:object size:0x40 scope:global align:32
 msg_data = .rodata:0x803D11E0; // type:object size:0x3C0 scope:global align:4
 font_data = .rodata:0x803D15A0; // type:object size:0x12260 scope:global align:4
 ...rodata.0 = .rodata:0x803E3800; // type:label scope:local align:4

configure.py

@@ -380,7 +380,15 @@ def MWVersion(cfg_version: str | None) -> str:
         case "GZ2J01":
             return "GC/2.7"
         case "RZDE01_00":
-            return "GC/3.0a5.2t"
+            # TODO: Find right compiler for Wii
+            # GC/3.0a3 codegen seems better than Wii compilers, but it fails linking (linker version?) and can't handle multi-char constants
+            # Potentially missing an early Wii compiler that had the earlier codegen and reverted char constant change?
+            # Or some specific compiler used in the early days of transitioning GC to Wii development
+            # Additionally, "-ipa file" seems to needed, so it can't be earlier than GC 3.0
+            # GC/3.0a5.2 breaks when compiling TUs like m_Do_graphic, but none of the other 3.0+ ones do
+            # Wii/1.0RC1 is the earliest Wii one we have at this time but it doesn't have the right codegen from GC/3.0+
+            # (GC 3.0a3 - Dec 2005 | GC 3.0a5.2 - Aug 2006 | Wii 1.0RC - May 2008)
+            return "Wii/1.0RC1"  
         case "ShieldD":
             return "Wii/1.0"
         case _:
@@ -2042,8 +2050,8 @@ config.libs = [
     ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_lv4Gate"),
     ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_lv4HsTarget"),
     ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_lv4PoGate"),
-    ActorRel(NonMatching, "d_a_obj_lv4RailWall"),
-    ActorRel(NonMatching, "d_a_obj_lv4SlideWall"),
+    ActorRel(MatchingFor("GZ2E01"), "d_a_obj_lv4RailWall"),
+    ActorRel(MatchingFor("GZ2E01"), "d_a_obj_lv4SlideWall"),
     ActorRel(NonMatching, "d_a_obj_lv4bridge"),
     ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_lv4chandelier"),
     ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_lv4digsand"),
@@ -2051,7 +2059,7 @@ config.libs = [
     ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_lv4gear"),
     ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_lv4prelvtr"),
     ActorRel(NonMatching, "d_a_obj_lv4prwall"),
-    ActorRel(NonMatching, "d_a_obj_lv4sand"),
+    ActorRel(MatchingFor("GZ2E01"), "d_a_obj_lv4sand"),
     ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_lv5FloorBoard"),
     ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_lv5IceWall"),
     ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_lv5SwIce"),

include/d/actor/d_a_b_ds.h

@@ -186,6 +186,8 @@ public:
     bool isAppearG() { return mIsAppearG; }
     bool isDead() { return mDead; }
     bool isArg0() { return arg0; }
+    void onDemo() { mIsDemo = true; }
+    void offDemo() { mIsDemo = false; }
 
 private:
     /* 0x05AC */ request_of_phase_process_class mPhase;

include/d/actor/d_a_bg_obj.h

@@ -83,7 +83,7 @@ public:
 
     /* 8045A940 */ virtual int CreateHeap();
     /* 8045A2B8 */ virtual int Create();
-    /* 8045BFBC */ virtual int Execute(f32 (**)[3][4]);
+    /* 8045BFBC */ virtual int Execute(Mtx**);
     /* 8045C078 */ virtual int Draw();
     /* 8045C2E8 */ virtual int Delete();
 

include/d/actor/d_a_cstaF.h

@@ -28,7 +28,7 @@ public:
     /* 804DF1A4 */ void initStartBrkBtk();
 
     /* 804DD978 */ virtual int CreateHeap();
-    /* 804DF37C */ virtual int Execute(f32 (**)[3][4]);
+    /* 804DF37C */ virtual int Execute(Mtx**);
     /* 804DF6E4 */ virtual int Draw();
 
     cXyz& getBallPos() { return m_ballPos; }

include/d/actor/d_a_dshutter.h

@@ -45,7 +45,7 @@ public:
     /* 80467B04 */ int executeClose();
 
     /* 8046751C */ virtual int CreateHeap();
-    /* 80467640 */ virtual int Execute(f32 (**)[3][4]);
+    /* 80467640 */ virtual int Execute(Mtx**);
     /* 8046759C */ virtual int Draw();
 
     inline int create();

include/d/actor/d_a_npc.h

@@ -1349,7 +1349,7 @@ public:
     /* 80155B54 */ ~daNpcF_MoveBgActor_c() {}
     /* 80155E88 */ virtual bool CreateHeap() { return true; }
     /* 80155E90 */ virtual bool Create() { return true; }
-    /* 80155EA0 */ virtual bool Execute(f32 (**)[3][4]) { return true; }
+    /* 80155EA0 */ virtual bool Execute(Mtx**) { return true; }
     /* 80155EA8 */ virtual bool Draw() { return true; }
     /* 80155E98 */ virtual bool Delete() { return true; }
     /* 80155EB0 */ virtual bool IsDelete() { return true; }

include/d/actor/d_a_obj_bemos.h

@@ -48,7 +48,7 @@ public:
     /* 80BAE778 */ int Create();
     /* 80BAEADC */ int CreateHeap();
     /* 80BAEFD8 */ void create1st();
-    /* 80BAF09C */ int Execute(f32 (**)[3][4]);
+    /* 80BAF09C */ int Execute(Mtx**);
     /* 80BAF29C */ void main_proc_call();
     /* 80BAF328 */ void initActionEnBemos();
     /* 80BAF37C */ void initActionObjBemos();

include/d/actor/d_a_obj_bhashi.h

@@ -24,7 +24,7 @@ public:
     /* 80578330 */ void CreateHeap();
     /* 8057842C */ void create();
     /* 80578788 */ void Create();
-    /* 805787CC */ void Execute(f32 (**)[3][4]);
+    /* 805787CC */ void Execute(Mtx**);
     /* 805788EC */ void Draw();
     /* 805789E8 */ void Delete();
 

include/d/actor/d_a_obj_bhbridge.h

@@ -21,7 +21,7 @@ public:
     /* 80BB55B8 */ void setBaseMtx();
     /* 80BB5934 */ virtual int CreateHeap();
     /* 80BB59AC */ virtual int Create();
-    /* 80BB5A14 */ virtual int Execute(f32 (**)[3][4]);
+    /* 80BB5A14 */ virtual int Execute(Mtx**);
     /* 80BB5E10 */ virtual int Draw();
     /* 80BB5EB4 */ virtual int Delete();
 

include/d/actor/d_a_obj_bmshutter.h

@@ -19,7 +19,7 @@ public:
     /* 80BB9B84 */ int Create();
     /* 80BB9C50 */ int CreateHeap();
     /* 80BB9CC0 */ int create();
-    /* 80BB9DB4 */ int Execute(f32 (**)[3][4]);
+    /* 80BB9DB4 */ int Execute(Mtx**);
     /* 80BB9F34 */ int checkSw();
     /* 80BB9FBC */ int checkAnySw();
     /* 80BBA044 */ int checkMySw();

include/d/actor/d_a_obj_cblock.h

@@ -33,7 +33,7 @@ public:
     /* 80BC5ABC */ int Create();
     /* 80BC5CF8 */ int CreateHeap();
     /* 80BC5E98 */ int create();
-    /* 80BC6260 */ int Execute(f32 (**)[3][4]);
+    /* 80BC6260 */ int Execute(Mtx**);
     /* 80BC6270 */ void initWait();
     /* 80BC627C */ void modeWait();
     /* 80BC6414 */ void initWalk();

include/d/actor/d_a_obj_chandelier.h

@@ -29,7 +29,7 @@ public:
     /* 80BC8008 */ int CreateHeap();
     /* 80BC8160 */ int Delete();
     /* 80BC8194 */ int Draw();
-    /* 80BC8238 */ int Execute(f32 (**)[3][4]);
+    /* 80BC8238 */ int Execute(Mtx**);
     /* 80BC82C0 */ void exeModeWait();
     /* 80BC834C */ void exeModeStartSwg();
     /* 80BC83E4 */ void exeModeDown();

include/d/actor/d_a_obj_cowdoor.h

@@ -18,7 +18,7 @@ public:
     /* 80BCC86C */ int Create();
     /* 80BCC8C4 */ int CreateHeap();
     /* 80BCC93C */ int create();
-    /* 80BCCA1C */ int Execute(f32 (**)[3][4]);
+    /* 80BCCA1C */ int Execute(Mtx**);
     /* 80BCCA48 */ int Draw();
     /* 80BCCAEC */ int Delete();
 

include/d/actor/d_a_obj_crvgate.h

@@ -44,7 +44,7 @@ public:
     /* 80BD2758 */ void SetDoor();
     /* 80BD28C0 */ int create();
     /* 80BD2E88 */ int Create();
-    /* 80BD2ECC */ int Execute(f32 (**)[3][4]);
+    /* 80BD2ECC */ int Execute(Mtx**);
     /* 80BD2FB8 */ int Draw();
     /* 80BD3074 */ int Delete();
 

include/d/actor/d_a_obj_crvlh_down.h

@@ -22,7 +22,7 @@ public:
     /* 80BD46EC */ void CreateHeap();
     /* 80BD4764 */ void create();
     /* 80BD4A84 */ void Create();
-    /* 80BD4AC8 */ void Execute(f32 (**)[3][4]);
+    /* 80BD4AC8 */ void Execute(Mtx**);
     /* 80BD4C44 */ void Draw();
     /* 80BD4CC8 */ void Delete();
 

include/d/actor/d_a_obj_crvlh_up.h

@@ -20,7 +20,7 @@ public:
     /* 80BD5378 */ void CreateHeap();
     /* 80BD53F0 */ void create();
     /* 80BD56EC */ void Create();
-    /* 80BD5730 */ void Execute(f32 (**)[3][4]);
+    /* 80BD5730 */ void Execute(Mtx**);
     /* 80BD593C */ void Draw();
     /* 80BD59C0 */ void Delete();
 

include/d/actor/d_a_obj_fan.h

@@ -21,7 +21,7 @@ public:
     /* 80BE4F08 */ int Create();
     /* 80BE4FD4 */ int CreateHeap();
     /* 80BE50EC */ int create1st();
-    /* 80BE519C */ int Execute(f32 (**)[3][4]);
+    /* 80BE519C */ int Execute(Mtx**);
     /* 80BE538C */ void action();
     /* 80BE583C */ void setCollision();
     /* 80BE5960 */ int Draw();

include/d/actor/d_a_obj_ganonwall2.h

@@ -19,7 +19,7 @@ public:
     /* 80BF5878 */ int Create();
     /* 80BF5950 */ int CreateHeap();
     /* 80BF5AB4 */ int create1st();
-    /* 80BF5B74 */ int Execute(f32 (**)[3][4]);
+    /* 80BF5B74 */ int Execute(Mtx**);
     /* 80BF5C0C */ int Draw();
     /* 80BF6004 */ int Delete();
 

include/d/actor/d_a_obj_grz_rock.h

@@ -20,7 +20,7 @@ public:
     /* 80C14DA0 */ void Create();
     /* 80C14EE0 */ void CreateHeap();
     /* 80C14F50 */ void create();
-    /* 80C1514C */ void Execute(f32 (**)[3][4]);
+    /* 80C1514C */ void Execute(Mtx**);
     /* 80C151A4 */ void Draw();
     /* 80C15248 */ void Delete();
 

include/d/actor/d_a_obj_h_saku.h

@@ -20,7 +20,7 @@ public:
     /* 80C15E44 */ void setBaseMtx();
     /* 80C161E8 */ void CreateHeap();
     /* 80C1629C */ void Create();
-    /* 80C162F4 */ void Execute(f32 (**)[3][4]);
+    /* 80C162F4 */ void Execute(Mtx**);
     /* 80C16340 */ void Draw();
     /* 80C1641C */ void Delete();
 

include/d/actor/d_a_obj_hasu2.h

@@ -19,7 +19,7 @@ public:
         /* 80C183D0 */ void setMtx();
         /* 80C18440 */ void CreateHeap();
         /* 80C184B0 */ void Create();
-        /* 80C185A4 */ void Execute(f32 (**)[3][4]);
+        /* 80C185A4 */ void Execute(Mtx**);
         /* 80C18600 */ void Draw();
         /* 80C186A4 */ void Delete();
         /* 80C186E0 */ void upDownHasu();

include/d/actor/d_a_obj_hfuta.h

@@ -27,7 +27,7 @@ public:
     /* 80C1DE94 */ int Create();
     /* 80C1DF2C */ int CreateHeap();
     /* 80C1DF9C */ int create1st();
-    /* 80C1E020 */ int Execute(f32 (**)[3][4]);
+    /* 80C1E020 */ int Execute(Mtx**);
     /* 80C1EB38 */ void mode_proc_call();
     /* 80C1EBDC */ void mode_wait();
     /* 80C1EC44 */ void mode_move();

include/d/actor/d_a_obj_hhashi.h

@@ -30,7 +30,7 @@ public:
     /* 80580DA4 */ int CreateHeap();
     /* 80580EA0 */ int create();
     /* 805811CC */ int Create();
-    /* 80581210 */ int Execute(f32 (**)[3][4]);
+    /* 80581210 */ int Execute(Mtx**);
     /* 805812BC */ int Draw();
     /* 8058140C */ int Delete();
 

include/d/actor/d_a_obj_hsTarget.h

@@ -17,7 +17,7 @@ public:
     /* 80C1F490 */ void setBaseMtx();
     /* 80C1F518 */ int CreateHeap();
     /* 80C1F598 */ int create();
-    /* 80C1F6B0 */ int Execute(f32 (**)[3][4]);
+    /* 80C1F6B0 */ int Execute(Mtx**);
     /* 80C1F6C4 */ int Draw();
     /* 80C1F728 */ int Delete();
 

include/d/actor/d_a_obj_ice_s.h

@@ -23,7 +23,7 @@ public:
     /* 80C212CC */ int create();
     /* 80C2157C */ int CreateHeap();
     /* 80C215F4 */ int Create();
-    /* 80C21634 */ int Execute(f32 (**)[3][4]);
+    /* 80C21634 */ int Execute(Mtx**);
     /* 80C21964 */ int Draw();
     /* 80C21A08 */ int Delete();
 

include/d/actor/d_a_obj_ikada.h

@@ -19,7 +19,7 @@ public:
     /* 80C26C7C */ void setBaseMtx();
     /* 80C27028 */ void CreateHeap();
     /* 80C270A0 */ void Create();
-    /* 80C270E0 */ void Execute(f32 (**)[3][4]);
+    /* 80C270E0 */ void Execute(Mtx**);
     /* 80C27400 */ void Draw();
     /* 80C274A4 */ void Delete();
 

include/d/actor/d_a_obj_ita.h

@@ -20,7 +20,7 @@ public:
     /* 80C28928 */ void create();
     /* 80C28BB0 */ void CreateHeap();
     /* 80C28C28 */ void Create();
-    /* 80C28C70 */ void Execute(f32 (**)[3][4]);
+    /* 80C28C70 */ void Execute(Mtx**);
     /* 80C290AC */ void Draw();
     /* 80C29150 */ void Delete();
 

include/d/actor/d_a_obj_kjgjs.h

@@ -18,7 +18,7 @@ public:
     /* 80C4616C */ void setMtx();
     /* 80C461E4 */ int CreateHeap();
     /* 80C46264 */ int Create();
-    /* 80C46310 */ int Execute(f32 (**)[3][4]);
+    /* 80C46310 */ int Execute(Mtx**);
     /* 80C46320 */ int Draw();
     /* 80C463C4 */ int Delete();
     /* 80C464CC */ virtual ~daObjKJgjs_c();

include/d/actor/d_a_obj_kshutter.h

@@ -25,7 +25,7 @@ public:
     /* 80C48328 */ void create1st();
     /* 80C483CC */ void event_proc_call();
     /* 80C48470 */ void event_proc_call2();
-    /* 80C4852C */ void Execute(f32 (**)[3][4]);
+    /* 80C4852C */ void Execute(Mtx**);
     /* 80C48590 */ void checkArea();
     /* 80C48708 */ void checkOpen();
     /* 80C48798 */ void getDemoAction();

include/d/actor/d_a_obj_ladder.h

@@ -59,7 +59,7 @@ namespace daObjLadder {
         /* 8058D9CC */ void mode_fell();
         /* 8058D9D0 */ void set_mtx();
         /* 8058DA64 */ void init_mtx();
-        /* 8058DAA0 */ int Execute(f32 (**)[3][4]);
+        /* 8058DAA0 */ int Execute(Mtx**);
         /* 8058DBB8 */ int Draw();
 
         u8 prm_get_evId() {

include/d/actor/d_a_obj_lv1Candle01.h

@@ -23,7 +23,7 @@ public:
     /* 80C57164 */ void setLight();
     /* 80C57194 */ void cutLight();
     /* 80C571C4 */ void pointLightProc();
-    /* 80C57274 */ int Execute(f32 (**)[3][4]);
+    /* 80C57274 */ int Execute(Mtx**);
     /* 80C575F4 */ int Draw();
     /* 80C57698 */ int Delete();
 

include/d/actor/d_a_obj_lv4EdShutter.h

@@ -16,7 +16,7 @@ public:
     /* 80C5DE38 */ void setBaseMtx();
     /* 80C5DEC8 */ void CreateHeap();
     /* 80C5DF34 */ void create();
-    /* 80C5E0A4 */ void Execute(f32 (**)[3][4]);
+    /* 80C5E0A4 */ void Execute(Mtx**);
     /* 80C5E0F4 */ void move();
     /* 80C5E1B0 */ void init_modeWait();
     /* 80C5E1C8 */ void modeWait();

include/d/actor/d_a_obj_lv4PoGate.h

@@ -46,7 +46,7 @@ public:
     /* 80C60534 */ void setEffect(int);
 
     /* 80C5FD40 */ virtual int CreateHeap();
-    /* 80C5FEDC */ virtual int Execute(f32 (**)[3][4]);
+    /* 80C5FEDC */ virtual int Execute(Mtx**);
     /* 80C605F8 */ virtual int Draw();
     /* 80C6069C */ virtual int Delete();
 

include/d/actor/d_a_obj_lv4RailWall.h

@@ -2,6 +2,12 @@
 #define D_A_OBJ_LV4RAILWALL_H
 
 #include "f_op/f_op_actor_mng.h"
+#include "d/d_bg_s_movebg_actor.h"
+#include "d/d_bg_s_acch.h"
+#include "d/d_cc_d.h"
+#include "d/d_event_lib.h"
+
+class daObjSwSpinner_c;
 
 /**
  * @ingroup actors-objects
@@ -11,14 +17,19 @@
  * @details
  *
  */
-class daObjLv4Wall_c : public fopAc_ac_c {
+class daObjLv4Wall_c : public dBgS_MoveBgActor, public dEvLib_callback_c {
 public:
+    enum {
+        MODE_WAIT,
+        MODE_MOVE,
+        MODE_DEAD,
+    };
+
+    daObjLv4Wall_c() : dEvLib_callback_c(this) {}
+
     /* 80C60AC4 */ void initBaseMtx();
     /* 80C60B00 */ void setBaseMtx();
-    /* 80C60B7C */ void Create();
-    /* 80C60CD0 */ void CreateHeap();
-    /* 80C60D40 */ void create1st();
-    /* 80C60DC4 */ void Execute(f32 (**)[3][4]);
+    /* 80C60D40 */ int create1st();
     /* 80C60E90 */ void action();
     /* 80C60F4C */ void mode_init_wait();
     /* 80C60F58 */ void mode_wait();
@@ -26,13 +37,31 @@ public:
     /* 80C61068 */ void mode_move();
     /* 80C613C0 */ void mode_init_dead();
     /* 80C613CC */ void mode_dead();
-    /* 80C613D0 */ void eventStart();
-    /* 80C6143C */ void Draw();
-    /* 80C614E0 */ void Delete();
-    /* 80C61940 */ ~daObjLv4Wall_c();
+
+    /* 80C61940 */ virtual ~daObjLv4Wall_c() {}
+
+    /* 80C60CD0 */ virtual int CreateHeap();
+    /* 80C60B7C */ virtual int Create();
+    /* 80C60DC4 */ virtual int Execute(Mtx**);
+    /* 80C6143C */ virtual int Draw();
+    /* 80C614E0 */ virtual int Delete();
+
+    /* 80C613D0 */ virtual bool eventStart();
+
+    u8 getSwbit() { return fopAcM_GetParamBit(this, 0, 8); }
 
 private:
-    /* 0x568 */ u8 field_0x568[0x95c - 0x568];
+    /* 0x5B0 */ request_of_phase_process_class mPhase;
+    /* 0x5B8 */ J3DModel* mpModel;
+    /* 0x5BC */ dBgS_ObjAcch field_0x5bc;
+    /* 0x794 */ dBgS_AcchCir field_0x794;
+    /* 0x7D4 */ dCcD_Stts field_0x7d4;
+    /* 0x810 */ dCcD_Cyl field_0x810;
+    /* 0x94C */ daObjSwSpinner_c* mpSwSpinner;
+    /* 0x950 */ f32 mHeight;
+    /* 0x954 */ int mRotCounter;
+    /* 0x958 */ u16 mMoveCounter;
+    /* 0x95A */ u8 mMode;
 };
 
 STATIC_ASSERT(sizeof(daObjLv4Wall_c) == 0x95c);

include/d/actor/d_a_obj_lv4SlideWall.h

@@ -2,6 +2,7 @@
 #define D_A_OBJ_LV4SLIDEWALL_H
 
 #include "f_op/f_op_actor_mng.h"
+#include "d/d_bg_s_movebg_actor.h"
 
 /**
  * @ingroup actors-objects
@@ -11,12 +12,10 @@
  * @details
  *
  */
-class daSldWall_c : public fopAc_ac_c {
+class daSldWall_c : public dBgS_MoveBgActor {
 public:
     /* 80C61EB0 */ void setBaseMtx();
-    /* 80C61F4C */ void CreateHeap();
-    /* 80C61FB8 */ void create();
-    /* 80C620E4 */ void Execute(f32 (**)[3][4]);
+    /* 80C61FB8 */ int create();
     /* 80C62134 */ void moveWall();
     /* 80C62238 */ void init_modeWait();
     /* 80C62244 */ void modeWait();
@@ -25,19 +24,35 @@ public:
     /* 80C62314 */ void init_modeMoveClose();
     /* 80C62320 */ void modeMoveClose();
     /* 80C623E0 */ void setSe();
-    /* 80C6249C */ void Draw();
-    /* 80C62540 */ void Delete();
+
+    /* 80C61F4C */ virtual int CreateHeap();
+    /* 80C620E4 */ virtual int Execute(Mtx**);
+    /* 80C6249C */ virtual int Draw();
+    /* 80C62540 */ virtual int Delete();
+
+    int getSw() { return fopAcM_GetParamBit(this, 0, 8); }
 
 private:
-    /* 0x568 */ u8 field_0x568[0x5b4 - 0x568];
+    /* 0x5A0 */ request_of_phase_process_class mPhase;
+    /* 0x5A8 */ J3DModel* mpModel;
+    /* 0x5AC */ u8 mMode;
+    /* 0x5AD */ u8 mSwbit;
+    /* 0x5AE */ u8 mIsSwitch;
+    /* 0x5B0 */ f32 field_0x5b0;
 };
 
 STATIC_ASSERT(sizeof(daSldWall_c) == 0x5b4);
 
-class daSldWall_HIO_c {
+class daSldWall_HIO_c : public mDoHIO_entry_c {
 public:
     /* 80C61E2C */ daSldWall_HIO_c();
-    /* 80C625FC */ ~daSldWall_HIO_c();
+    /* 80C625FC */ virtual ~daSldWall_HIO_c() {}
+
+    void genMessage(JORMContext*);
+
+    /* 0x08 */ f32 move_amount;
+    /* 0x0C */ f32 speed;
+    /* 0x10 */ u8 vibration;
 };
 
 

include/d/actor/d_a_obj_lv4bridge.h

@@ -18,7 +18,7 @@ public:
     /* 80C62994 */ void Create();
     /* 80C62A2C */ void CreateHeap();
     /* 80C62A9C */ void create1st();
-    /* 80C62B20 */ void Execute(f32 (**)[3][4]);
+    /* 80C62B20 */ void Execute(Mtx**);
     /* 80C62B6C */ void action();
     /* 80C62C28 */ void mode_init_wait();
     /* 80C62C34 */ void mode_wait();

include/d/actor/d_a_obj_lv4digsand.h

@@ -29,7 +29,7 @@ public:
 
     /* 80C66C24 */ virtual int CreateHeap();
     /* 80C66BC8 */ virtual int Create();
-    /* 80C66D40 */ virtual int Execute(f32 (**)[3][4]);
+    /* 80C66D40 */ virtual int Execute(Mtx**);
     /* 80C67104 */ virtual int Draw();
     /* 80C671A8 */ virtual int Delete();
 

include/d/actor/d_a_obj_lv4floor.h

@@ -32,7 +32,7 @@ public:
 
     /* 80C678D4 */ virtual int CreateHeap();
     /* 80C678B0 */ virtual int Create();
-    /* 80C679E4 */ virtual int Execute(f32 (**)[3][4]);
+    /* 80C679E4 */ virtual int Execute(Mtx**);
     /* 80C67BD4 */ virtual int Draw();
     /* 80C67C78 */ virtual int Delete();
 

include/d/actor/d_a_obj_lv4prwall.h

@@ -17,7 +17,7 @@ public:
     /* 80C68DD8 */ void setMtx();
     /* 80C68F20 */ void CreateHeap();
     /* 80C68FA0 */ void Create();
-    /* 80C690D8 */ void Execute(f32 (**)[3][4]);
+    /* 80C690D8 */ void Execute(Mtx**);
     /* 80C696BC */ void Draw();
     /* 80C69760 */ void Delete();
     /* 80C69870 */ ~daObjLv4PRwall_c();

include/d/actor/d_a_obj_lv4sand.h

@@ -2,6 +2,8 @@
 #define D_A_OBJ_LV4SAND_H
 
 #include "f_op/f_op_actor_mng.h"
+#include "d/d_bg_s_movebg_actor.h"
+#include "d/d_event_lib.h"
 
 /**
  * @ingroup actors-objects
@@ -11,14 +13,19 @@
  * @details
  *
  */
-class daObjLv4Sand_c : public fopAc_ac_c {
+class daObjLv4Sand_c : public dBgS_MoveBgActor, public dEvLib_callback_c {
 public:
+    enum {
+        MODE_WAIT,
+        MODE_MOVE,
+        MODE_DEAD,
+    };
+
+    daObjLv4Sand_c() : dEvLib_callback_c(this) {}
+
     /* 80C69A98 */ void initBaseMtx();
     /* 80C69AD4 */ void setBaseMtx();
-    /* 80C69B50 */ void Create();
-    /* 80C69C28 */ void CreateHeap();
-    /* 80C69D8C */ void create1st();
-    /* 80C69E10 */ void Execute(f32 (**)[3][4]);
+    /* 80C69D8C */ int create1st();
     /* 80C69F18 */ void action();
     /* 80C69FBC */ void mode_init_wait();
     /* 80C69FC8 */ void mode_wait();
@@ -26,13 +33,25 @@ public:
     /* 80C6A034 */ void mode_move();
     /* 80C6A09C */ void mode_init_dead();
     /* 80C6A0A8 */ void mode_dead();
-    /* 80C6A0AC */ void eventStart();
-    /* 80C6A0D0 */ void Draw();
-    /* 80C6A18C */ void Delete();
-    /* 80C6A30C */ ~daObjLv4Sand_c();
+
+    /* 80C6A30C */ virtual ~daObjLv4Sand_c() {}
+
+    /* 80C69C28 */ virtual int CreateHeap();
+    /* 80C69B50 */ virtual int Create();
+    /* 80C69E10 */ virtual int Execute(Mtx**);
+    /* 80C6A0D0 */ virtual int Draw();
+    /* 80C6A18C */ virtual int Delete();
+
+    /* 80C6A0AC */ virtual bool eventStart();
+
+    u8 getSwbit() { return fopAcM_GetParamBit(this, 0, 8); }
 
 private:
-    /* 0x568 */ u8 field_0x568[0x5c8 - 0x568];
+    /* 0x5B0 */ request_of_phase_process_class mPhase;
+    /* 0x5B8 */ J3DModel* mpModel;
+    /* 0x5BC */ mDoExt_btkAnm* mpBtk;
+    /* 0x5C0 */ f32 mHeight;
+    /* 0x5C4 */ u8 mMode;
 };
 
 STATIC_ASSERT(sizeof(daObjLv4Sand_c) == 0x5c8);

include/d/actor/d_a_obj_lv5ychndlr.h

@@ -21,7 +21,7 @@ public:
 
     /* 80C6DA5C */ virtual int CreateHeap();
     /* 80C6DB5C */ virtual int Create();
-    /* 80C6DC64 */ virtual int Execute(f32 (**)[3][4]);
+    /* 80C6DC64 */ virtual int Execute(Mtx**);
     /* 80C6E300 */ virtual int Draw();
     /* 80C6E3C8 */ virtual int Delete();
     /* 80C6E808 */ virtual ~daObjYchndlr_c() {}

include/d/actor/d_a_obj_lv6ChangeGate.h

@@ -17,7 +17,7 @@ public:
     /* 80C70DD4 */ void CreateHeap();
     /* 80C70E40 */ void create();
     /* 80C712A8 */ void isSwitch();
-    /* 80C712F4 */ void Execute(f32 (**)[3][4]);
+    /* 80C712F4 */ void Execute(Mtx**);
     /* 80C71494 */ void moveGate();
     /* 80C715BC */ void eventStart();
     /* 80C715F4 */ void init_modeWait();

include/d/actor/d_a_obj_lv6FurikoTrap.h

@@ -16,7 +16,7 @@ public:
     /* 80C72510 */ void setBaseMtx();
     /* 80C72598 */ void CreateHeap();
     /* 80C72604 */ void create();
-    /* 80C729B4 */ void Execute(f32 (**)[3][4]);
+    /* 80C729B4 */ void Execute(Mtx**);
     /* 80C72CA8 */ void move();
     /* 80C72D24 */ void init_modeMove();
     /* 80C72D38 */ void modeMove();

include/d/actor/d_a_obj_lv6Lblock.h

@@ -17,7 +17,7 @@ public:
     /* 80C734EC */ void CreateHeap();
     /* 80C73558 */ void create();
     /* 80C736C0 */ void isSwitch();
-    /* 80C7370C */ void Execute(f32 (**)[3][4]);
+    /* 80C7370C */ void Execute(Mtx**);
     /* 80C7375C */ void moveBlock();
     /* 80C73850 */ void init_modeWait();
     /* 80C7385C */ void modeWait();

include/d/actor/d_a_obj_lv6SwGate.h

@@ -17,7 +17,7 @@ public:
     /* 80C74158 */ void CreateHeap();
     /* 80C7429C */ void create();
     /* 80C74720 */ void isSwitch();
-    /* 80C7476C */ void Execute(f32 (**)[3][4]);
+    /* 80C7476C */ void Execute(Mtx**);
     /* 80C74A3C */ void moveGate();
     /* 80C74B48 */ void init_modeWait();
     /* 80C74B54 */ void modeWait();

include/d/actor/d_a_obj_lv6Tenbin.h

@@ -18,7 +18,7 @@ public:
     /* 80C76D10 */ void create();
     /* 80C76EE0 */ void rideCallBackRight(dBgW*, fopAc_ac_c*, fopAc_ac_c*);
     /* 80C77078 */ void rideCallBackLeft(dBgW*, fopAc_ac_c*, fopAc_ac_c*);
-    /* 80C77200 */ void Execute(f32 (**)[3][4]);
+    /* 80C77200 */ void Execute(Mtx**);
     /* 80C772BC */ void procMain();
     /* 80C77464 */ void init_modeWait();
     /* 80C77470 */ void modeWait();

include/d/actor/d_a_obj_lv6TogeTrap.h

@@ -17,7 +17,7 @@ public:
     /* 80C79FE8 */ void CreateHeap();
     /* 80C7A068 */ void create();
     /* 80C7A6B0 */ void searchSekizoAct(void*, void*);
-    /* 80C7A700 */ void Execute(f32 (**)[3][4]);
+    /* 80C7A700 */ void Execute(Mtx**);
     /* 80C7A97C */ void moveLift();
     /* 80C7ABC8 */ void executeType1();
     /* 80C7ACA0 */ void init_modeBound();

include/d/actor/d_a_obj_lv6bemos.h

@@ -22,7 +22,7 @@ public:
     /* 80C7CED4 */ int Create();
     /* 80C7CFD0 */ int CreateHeap();
     /* 80C7D2F8 */ cPhs__Step create1st();
-    /* 80C7D3A4 */ int Execute(f32 (**)[3][4]);
+    /* 80C7D3A4 */ int Execute(Mtx**);
     /* 80C7D4F4 */ void action();
     /* 80C7D598 */ void actionWait();
     /* 80C7D6CC */ void actionFindPlayer();

include/d/actor/d_a_obj_lv6bemos2.h

@@ -23,7 +23,7 @@ public:
     /* 80C7E448 */ int Create();
     /* 80C7E764 */ int CreateHeap();
     /* 80C7EB7C */ cPhs__Step create1st();
-    /* 80C7EC6C */ int Execute(f32 (**)[3][4]);
+    /* 80C7EC6C */ int Execute(Mtx**);
     /* 80C7EE50 */ void action();
     /* 80C7F2A4 */ void calcBeam();
     /* 80C7F904 */ int checkFindPlayer();

include/d/actor/d_a_obj_lv6egate.h

@@ -19,7 +19,7 @@ public:
     /* 80C82180 */ void Create();
     /* 80C822DC */ void offDisp();
     /* 80C82330 */ void onDisp();
-    /* 80C82388 */ void Execute(f32 (**)[3][4]);
+    /* 80C82388 */ void Execute(Mtx**);
     /* 80C82690 */ void Draw();
     /* 80C826A0 */ void Delete();
     /* 80C82A80 */ ~daObjLv6EGate_c();

include/d/actor/d_a_obj_lv6elevta.h

@@ -19,7 +19,7 @@ public:
     /* 80C82EA8 */ void Create();
     /* 80C83028 */ void eventStart();
     /* 80C830BC */ void moveAngle(void*);
-    /* 80C8321C */ void Execute(f32 (**)[3][4]);
+    /* 80C8321C */ void Execute(Mtx**);
     /* 80C83538 */ void Draw();
     /* 80C835DC */ void Delete();
     /* 80C83764 */ ~daObjLv6ElevtA_c();

include/d/actor/d_a_obj_lv6swturn.h

@@ -18,7 +18,7 @@ public:
     /* 80C83B38 */ void Create();
     /* 80C83C10 */ void CreateHeap();
     /* 80C83C80 */ void create1st();
-    /* 80C83D04 */ void Execute(f32 (**)[3][4]);
+    /* 80C83D04 */ void Execute(Mtx**);
     /* 80C83D94 */ void mode_proc_call();
     /* 80C83E20 */ void init_modeWait();
     /* 80C83E58 */ void modeWait();

include/d/actor/d_a_obj_lv7BsGate.h

@@ -16,7 +16,7 @@ public:
     /* 80C84930 */ void setBaseMtx();
     /* 80C849CC */ void CreateHeap();
     /* 80C84A4C */ void create();
-    /* 80C84BCC */ void Execute(f32 (**)[3][4]);
+    /* 80C84BCC */ void Execute(Mtx**);
     /* 80C84C1C */ void moveGate();
     /* 80C84D24 */ void init_modeWait();
     /* 80C84D30 */ void modeWait();

include/d/actor/d_a_obj_lv7PropellerY.h

@@ -16,7 +16,7 @@ public:
     /* 80C8550C */ void setBaseMtx();
     /* 80C855A4 */ void CreateHeap();
     /* 80C85624 */ void create();
-    /* 80C85810 */ void Execute(f32 (**)[3][4]);
+    /* 80C85810 */ void Execute(Mtx**);
     /* 80C85860 */ void procMain();
     /* 80C859B4 */ void init_modeMoveWait();
     /* 80C859C0 */ void modeMoveWait();

include/d/actor/d_a_obj_lv7bridge.h

@@ -19,7 +19,7 @@ public:
     /* 80C865B8 */ void Create();
     /* 80C867CC */ void CreateHeap();
     /* 80C86A44 */ void create1st();
-    /* 80C86B40 */ void Execute(f32 (**)[3][4]);
+    /* 80C86B40 */ void Execute(Mtx**);
     /* 80C86E68 */ void action();
     /* 80C86F44 */ void mode_action();
     /* 80C87210 */ void mode_end();

include/d/actor/d_a_obj_lv8KekkaiTrap.h

@@ -16,7 +16,7 @@ public:
     /* 80C87D40 */ void setBaseMtx();
     /* 80C87DC8 */ void CreateHeap();
     /* 80C87E48 */ void create();
-    /* 80C87FB0 */ void Execute(f32 (**)[3][4]);
+    /* 80C87FB0 */ void Execute(Mtx**);
     /* 80C88000 */ void moveMain();
     /* 80C88104 */ void init_modeWait();
     /* 80C88110 */ void modeWait();

include/d/actor/d_a_obj_lv8Lift.h

@@ -33,7 +33,7 @@ public:
     /* 80C88928 */ int create();
     /* 80C88D6C */ void lightSet();
     /* 80C88DBC */ static void rideCallBack(dBgW*, fopAc_ac_c*, fopAc_ac_c*);
-    /* 80C88DD4 */ int Execute(f32 (**)[3][4]);
+    /* 80C88DD4 */ int Execute(Mtx**);
     /* 80C88E34 */ void moveLift();
     /* 80C890B8 */ void modeAcc();
     /* 80C89198 */ void init_modeMove();

include/d/actor/d_a_obj_lv8OptiLift.h

@@ -53,7 +53,7 @@ public:
     /* 80C8B53C */ void setNextPoint();
 
     /* 80C8A438 */ virtual int CreateHeap();
-    /* 80C8A7E8 */ virtual int Execute(f32 (**)[3][4]);
+    /* 80C8A7E8 */ virtual int Execute(Mtx**);
     /* 80C8B66C */ virtual int Draw();
     /* 80C8B824 */ virtual int Delete();
 

include/d/actor/d_a_obj_lv8UdFloor.h

@@ -16,7 +16,7 @@ public:
     /* 80C8BDC8 */ void setBaseMtx();
     /* 80C8BE64 */ void CreateHeap();
     /* 80C8BEE4 */ void create();
-    /* 80C8C0DC */ void Execute(f32 (**)[3][4]);
+    /* 80C8C0DC */ void Execute(Mtx**);
     /* 80C8C12C */ void moveLift();
     /* 80C8C264 */ void init_modeWait();
     /* 80C8C270 */ void modeWait();

include/d/actor/d_a_obj_lv9SwShutter.h

@@ -16,7 +16,7 @@ public:
     /* 80C8CF38 */ void setBaseMtx();
     /* 80C8CFD4 */ void CreateHeap();
     /* 80C8D040 */ void create();
-    /* 80C8D168 */ void Execute(f32 (**)[3][4]);
+    /* 80C8D168 */ void Execute(Mtx**);
     /* 80C8D1B8 */ void moveShutter();
     /* 80C8D2BC */ void init_modeWait();
     /* 80C8D2C8 */ void modeWait();

include/d/actor/d_a_obj_metalbox.h

@@ -29,7 +29,7 @@ public:
     /* 80592F48 */ int Create();
     /* 80592FD4 */ int CreateHeap();
     /* 80593044 */ int create();
-    /* 805932C4 */ int Execute(f32 (**)[3][4]);
+    /* 805932C4 */ int Execute(Mtx**);
     /* 805932F0 */ int Draw();
     /* 80593394 */ int Delete();
 };

include/d/actor/d_a_obj_mgate.h

@@ -30,7 +30,7 @@ public:
 
     /* 805937AC */ virtual int CreateHeap();
     /* 80593760 */ virtual int Create();
-    /* 80593988 */ virtual int Execute(f32 (**)[3][4]);
+    /* 80593988 */ virtual int Execute(Mtx**);
     /* 80593C4C */ virtual int Draw();
     /* 80593D18 */ virtual int Delete();
 

include/d/actor/d_a_obj_mvstair.h

@@ -51,7 +51,7 @@ public:
 
     /* 80C9D2B8 */ virtual int CreateHeap();
     /* 80C9D148 */ virtual int Create();
-    /* 80C9D594 */ virtual int Execute(f32 (**)[3][4]);
+    /* 80C9D594 */ virtual int Execute(Mtx**);
     /* 80C9D710 */ virtual int Draw();
     /* 80C9D7B4 */ virtual int Delete();
 

include/d/actor/d_a_obj_pdwall.h

@@ -17,7 +17,7 @@ public:
     /* 80CAC8DC */ void setMtx();
     /* 80CACA44 */ void CreateHeap();
     /* 80CACBA8 */ void Create();
-    /* 80CACCE0 */ void Execute(f32 (**)[3][4]);
+    /* 80CACCE0 */ void Execute(Mtx**);
     /* 80CACF14 */ void Draw();
     /* 80CACFD4 */ void Delete();
     /* 80CAD140 */ ~daObjPDwall_c();

include/d/actor/d_a_obj_poCandle.h

@@ -20,7 +20,7 @@ public:
     /* 80CB1E00 */ void setLight();
     /* 80CB1E30 */ void cutLight();
     /* 80CB1E60 */ void pointLightProc();
-    /* 80CB1F10 */ void Execute(f32 (**)[3][4]);
+    /* 80CB1F10 */ void Execute(Mtx**);
     /* 80CB2140 */ void init_modeWait();
     /* 80CB214C */ void modeWait();
     /* 80CB21D8 */ void init_modeOnFire();

include/d/actor/d_a_obj_poTbox.h

@@ -16,7 +16,7 @@ public:
     /* 80CB42C8 */ void setBaseMtx();
     /* 80CB43D0 */ void CreateHeap();
     /* 80CB46C4 */ void create();
-    /* 80CB499C */ void Execute(f32 (**)[3][4]);
+    /* 80CB499C */ void Execute(Mtx**);
     /* 80CB4AA8 */ void init_modeWait();
     /* 80CB4AB4 */ void modeWait();
     /* 80CB4B10 */ void init_modeOpen();

include/d/actor/d_a_obj_rotBridge.h

@@ -17,7 +17,7 @@ public:
     /* 80CBEB38 */ void CreateHeap();
     /* 80CBECBC */ void create();
     /* 80CBEF1C */ void rideCallBack(dBgW*, fopAc_ac_c*, fopAc_ac_c*);
-    /* 80CBEF34 */ void Execute(f32 (**)[3][4]);
+    /* 80CBEF34 */ void Execute(Mtx**);
     /* 80CBF050 */ void playerAreaCheck();
     /* 80CBF1EC */ void moveBridge();
     /* 80CBF404 */ void Draw();

include/d/actor/d_a_obj_rotTrap.h

@@ -16,7 +16,7 @@ public:
     /* 80CBF940 */ void setBaseMtx();
     /* 80CBF9D8 */ void CreateHeap();
     /* 80CBFAC8 */ void create();
-    /* 80CBFEC4 */ void Execute(f32 (**)[3][4]);
+    /* 80CBFEC4 */ void Execute(Mtx**);
     /* 80CBFF1C */ void procMain();
     /* 80CC00AC */ void init_modeWait();
     /* 80CC0120 */ void modeWait();

include/d/actor/d_a_obj_smgdoor.h

@@ -18,7 +18,7 @@ public:
     /* 80CDBD38 */ void Create();
     /* 80CDBE1C */ void CreateHeap();
     /* 80CDBED4 */ void create1st();
-    /* 80CDBFA4 */ void Execute(f32 (**)[3][4]);
+    /* 80CDBFA4 */ void Execute(Mtx**);
     /* 80CDBFF0 */ void getDemoAction();
     /* 80CDC038 */ void demoProc();
     /* 80CDC248 */ void openInit();

include/d/actor/d_a_obj_spinLift.h

@@ -16,7 +16,7 @@ public:
     /* 80CE3E2C */ void setBaseMtx();
     /* 80CE3E9C */ void CreateHeap();
     /* 80CE3F1C */ void create();
-    /* 80CE40FC */ void Execute(f32 (**)[3][4]);
+    /* 80CE40FC */ void Execute(Mtx**);
     /* 80CE414C */ void moveLift();
     /* 80CE4290 */ void init_modeWait();
     /* 80CE429C */ void modeWait();

include/d/actor/d_a_obj_stopper.h

@@ -34,7 +34,7 @@ public:
     /* 80CED0B8 */ int Create();
     /* 80CED20C */ int CreateHeap();
     /* 80CED258 */ int create();
-    /* 80CED6BC */ int Execute(f32 (**)[3][4]);
+    /* 80CED6BC */ int Execute(Mtx**);
     /* 80CED708 */ void action();
     /* 80CED824 */ void actionWait();
     /* 80CEDA24 */ void actionWaitOrderEvent();

include/d/actor/d_a_obj_swLight.h

@@ -18,7 +18,7 @@ public:
     /* 80CF7038 */ void Create();
     /* 80CF71F0 */ void CreateHeap();
     /* 80CF7260 */ void create1st();
-    /* 80CF7320 */ void Execute(f32 (**)[3][4]);
+    /* 80CF7320 */ void Execute(Mtx**);
     /* 80CF73E0 */ void action();
     /* 80CF761C */ void init_modeSwOnWait();
     /* 80CF766C */ void modeSwOnWait();

include/d/actor/d_a_obj_swpush5.h

@@ -18,7 +18,7 @@ public:
     /* 8059B920 */ void Create();
     /* 8059BA1C */ void CreateHeap();
     /* 8059BB1C */ void create();
-    /* 8059BBD4 */ void Execute(f32 (**)[3][4]);
+    /* 8059BBD4 */ void Execute(Mtx**);
     /* 8059BC70 */ void setting_ride_flag();
     /* 8059BD24 */ bool checkPushable();
     /* 8059BD2C */ void event_proc_call();

include/d/actor/d_a_obj_szbridge.h

@@ -19,7 +19,7 @@ public:
     /* 80D04528 */ void CreateHeap();
     /* 80D04598 */ void chkBg();
     /* 80D048C4 */ void Create();
-    /* 80D04974 */ void Execute(f32 (**)[3][4]);
+    /* 80D04974 */ void Execute(Mtx**);
     /* 80D049E4 */ void Draw();
     /* 80D04A88 */ void Delete();
     /* 80D04B90 */ ~daObjSZbridge_c();

include/d/actor/d_a_obj_taFence.h

@@ -16,7 +16,7 @@ public:
     /* 80D04F8C */ void setBaseMtx();
     /* 80D0503C */ void CreateHeap();
     /* 80D050A8 */ void create();
-    /* 80D05550 */ void Execute(f32 (**)[3][4]);
+    /* 80D05550 */ void Execute(Mtx**);
     /* 80D055A0 */ void fenceProc();
     /* 80D057C4 */ void init_modeWait();
     /* 80D057D0 */ void modeWait();

include/d/actor/d_a_obj_thashi.h

@@ -18,7 +18,7 @@ public:
     /* 80D0C654 */ void CreateHeap();
     /* 80D0C8B4 */ void create();
     /* 80D0CE70 */ void Create();
-    /* 80D0CEB4 */ void Execute(f32 (**)[3][4]);
+    /* 80D0CEB4 */ void Execute(Mtx**);
     /* 80D0CEE0 */ void Draw();
     /* 80D0D140 */ void Delete();
 

include/d/actor/d_a_tbox.h

@@ -120,7 +120,7 @@ public:
     /* 804956EC */ void mode_exec_wait();
     /* 80495818 */ void mode_exec();
     /* 80495910 */ cPhs__Step create1st();
-    /* 804959EC */ int Execute(f32 (**)[3][4]);
+    /* 804959EC */ int Execute(Mtx**);
     /* 80495AF0 */ int Draw();
     /* 80495C9C */ int Delete();
     /* 804961B0 */ int Create();

include/d/actor/d_a_tbox2.h

@@ -59,7 +59,7 @@ public:
 
     /* 80496C20 */ virtual int CreateHeap();
     /* 80496AB8 */ virtual int Create();
-    /* 80497500 */ virtual int Execute(f32 (**)[3][4]);
+    /* 80497500 */ virtual int Execute(Mtx**);
     /* 80497DA0 */ virtual int Draw();
     /* 80497E6C */ virtual int Delete();
     /* 80498140 */ virtual BOOL checkSmallTbox() { return true; }

include/m_Do/m_Do_ext.h

@@ -849,10 +849,16 @@ JKRSolidHeap* mDoExt_createSolidHeapFromSystem(u32 i_size, u32 i_alignment);
 u32 mDoExt_adjustSolidHeapToSystem(JKRSolidHeap* i_heap);
 JKRHeap* mDoExt_getCurrentHeap();
 void mDoExt_removeMesgFont();
+
+// TODO: make a better name. this flag setup is used for a majority of models which makes it seem like it was a macro
+// maybe a macro for the mDoExt_J3DModel__create call itself?
+#define BMD_DEFAULT_DIFF_FLAGS J3D_DIFF_FLAG(FALSE, FALSE, TRUE, 8, 0, FALSE, 0, 0, TRUE, FALSE, FALSE, FALSE, TRUE, FALSE)
+
 void mDoExt_modelUpdate(J3DModel* i_model);
 void mDoExt_modelUpdateDL(J3DModel* i_model);
 J3DModel* mDoExt_J3DModel__create(J3DModelData* i_modelData, u32 i_modelFlag,
                                   u32 i_differedDlistFlag);
+
 void mDoExt_setAraCacheSize(u32 size);
 int mDoExt_resIDToIndex(JKRArchive* p_archive, u16 id);
 void mDoExt_modelEntryDL(J3DModel* i_model);

src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c

@@ -848,7 +848,7 @@ asm u32 __TRK_get_MSR() {
 }
 
 /* 8036F640-8036F648 -00001 0008+00 0/0 0/0 0/0 .text            __TRK_set_MSR */
-asm void __TRK_set_MSR() {
+asm void __TRK_set_MSR(register u32) {
     // clang-format off
 	nofralloc
 	mtmsr r3

src/d/actor/d_a_bg_obj.cpp

@@ -1318,7 +1318,7 @@ int daBgObj_c::ExecuteType1() {
 }
 
 /* 8045BFBC-8045C078 0029DC 00BC+00 1/0 0/0 0/0 .text            Execute__9daBgObj_cFPPA3_A4_f */
-int daBgObj_c::Execute(f32 (**param_0)[3][4]) {
+int daBgObj_c::Execute(Mtx** param_0) {
     (this->*mExecuteFunc[mSpecData.mSpecType])();
 
     for (int i = 0; i < 2; i++) {

src/d/actor/d_a_cstaF.cpp

@@ -491,7 +491,7 @@ void daCstaF_c::initStartBrkBtk() {
 }
 
 /* 804DF37C-804DF6C4 001A9C 0348+00 1/0 0/0 0/0 .text            Execute__9daCstaF_cFPPA3_A4_f */
-int daCstaF_c::Execute(f32 (**param_0)[3][4]) {
+int daCstaF_c::Execute(Mtx** param_0) {
     daAlink_c* player = daAlink_getAlinkActorClass();
 
     setAnime();

src/d/actor/d_a_dshutter.cpp

@@ -50,7 +50,7 @@ int daDsh_c::Draw() {
 }
 
 /* 80467640-80467694 000220 0054+00 1/0 0/0 0/0 .text            Execute__7daDsh_cFPPA3_A4_f */
-int daDsh_c::Execute(f32 (**param_0)[3][4]) {
+int daDsh_c::Execute(Mtx** param_0) {
     callExecute();
     setMtx();
     *param_0 = &mBgMtx;

src/d/actor/d_a_obj_bemos.cpp

@@ -1006,7 +1006,7 @@ COMPILER_STRIP_GATE(0x80BB383C, &lit_4293);
 #pragma pop
 
 /* 80BAF09C-80BAF29C 000E1C 0200+00 1/0 0/0 0/0 .text            Execute__9daObjBm_cFPPA3_A4_f */
-int daObjBm_c::Execute(f32 (**param_0)[3][4]) {
+int daObjBm_c::Execute(Mtx** param_0) {
     // NONMATCHING
 }
 

src/d/actor/d_a_obj_bhashi.cpp

@@ -712,7 +712,7 @@ COMPILER_STRIP_GATE(0x80578BA4, &lit_4627);
 
 /* 805787CC-805788EC 001DEC 0120+00 1/0 0/0 0/0 .text            Execute__13daObjBHASHI_cFPPA3_A4_f
  */
-void daObjBHASHI_c::Execute(f32 (**param_0)[3][4]) {
+void daObjBHASHI_c::Execute(Mtx** param_0) {
     // NONMATCHING
 }
 

src/d/actor/d_a_obj_bmshutter.cpp

@@ -115,7 +115,7 @@ int daObjBmSh_c::create() {
 }
 
 /* 80BB9DB4-80BB9F34 0003D4 0180+00 1/0 0/0 0/0 .text            Execute__11daObjBmSh_cFPPA3_A4_f */
-int daObjBmSh_c::Execute(f32 (**param_0)[3][4]) {
+int daObjBmSh_c::Execute(Mtx** param_0) {
     daPy_py_c* player = dComIfGp_getLinkPlayer();
     if (player->checkFrontRollCrash()) {
         cXyz min = l_check_area[0];

src/d/actor/d_a_obj_chandelier.cpp

@@ -76,7 +76,7 @@ int daObjChandelier_c::Draw() {
 }
 
 /* 80BC8238-80BC82C0 000378 0088+00 1/0 0/0 0/0 .text Execute__17daObjChandelier_cFPPA3_A4_f */
-int daObjChandelier_c::Execute(f32 (**param_0)[3][4]) {
+int daObjChandelier_c::Execute(Mtx** param_0) {
     if (s_exeProc[mMode] != NULL) {
         (this->*s_exeProc[mMode])();
     }

src/d/actor/d_a_obj_cowdoor.cpp

@@ -57,7 +57,7 @@ int daCowdoor_c::create() {
 }
 
 /* 80BCCA1C-80BCCA48 00029C 002C+00 1/0 0/0 0/0 .text            Execute__11daCowdoor_cFPPA3_A4_f */
-int daCowdoor_c::Execute(f32 (**param_0)[3][4]) {
+int daCowdoor_c::Execute(Mtx** param_0) {
     *param_0 = &mBgMtx;
     setBaseMtx();
     return 1;

src/d/actor/d_a_obj_crvgate.cpp

@@ -804,7 +804,7 @@ int daObjCRVGATE_c::Create() {
 
 /* 80BD2ECC-80BD2FB8 002BAC 00EC+00 1/0 0/0 0/0 .text Execute__14daObjCRVGATE_cFPPA3_A4_f
  */
-int daObjCRVGATE_c::Execute(f32 (**param_0)[3][4]) {
+int daObjCRVGATE_c::Execute(Mtx** param_0) {
     s_CoCount = 0;
 
     if (mKeyParam == 0x01) {

src/d/actor/d_a_obj_crvlh_down.cpp

@@ -401,7 +401,7 @@ COMPILER_STRIP_GATE(0x80BD4D84, &lit_4044);
 #pragma pop
 
 /* 80BD4AC8-80BD4C44 000A08 017C+00 1/0 0/0 0/0 .text Execute__15daObjCRVLH_DW_cFPPA3_A4_f */
-void daObjCRVLH_DW_c::Execute(f32 (**param_0)[3][4]) {
+void daObjCRVLH_DW_c::Execute(Mtx** param_0) {
     // NONMATCHING
 }
 

src/d/actor/d_a_obj_crvlh_up.cpp

@@ -435,7 +435,7 @@ COMPILER_STRIP_GATE(0x80BD5A60, &lit_4002);
 #pragma pop
 
 /* 80BD5730-80BD593C 0008D0 020C+00 1/0 0/0 0/0 .text Execute__15daObjCRVLH_UP_cFPPA3_A4_f */
-void daObjCRVLH_UP_c::Execute(f32 (**param_0)[3][4]) {
+void daObjCRVLH_UP_c::Execute(Mtx** param_0) {
     // NONMATCHING
 }
 

src/d/actor/d_a_obj_grz_rock.cpp

@@ -229,7 +229,7 @@ extern "C" void __dt__12dBgS_ObjAcchFv() {
 
 /* 80C1514C-80C151A4 0005EC 0058+00 1/0 0/0 0/0 .text            Execute__14daObjGrzRock_cFPPA3_A4_f
  */
-void daObjGrzRock_c::Execute(f32 (**param_0)[3][4]) {
+void daObjGrzRock_c::Execute(Mtx** param_0) {
     // NONMATCHING
 }
 

src/d/actor/d_a_obj_h_saku.cpp

@@ -402,7 +402,7 @@ void daObjH_Saku_c::Create() {
 
 /* 80C162F4-80C16340 000EB4 004C+00 1/0 0/0 0/0 .text            Execute__13daObjH_Saku_cFPPA3_A4_f
  */
-void daObjH_Saku_c::Execute(f32 (**param_0)[3][4]) {
+void daObjH_Saku_c::Execute(Mtx** param_0) {
     // NONMATCHING
 }
 

src/d/actor/d_a_obj_hasu2.cpp

@@ -204,7 +204,7 @@ void nObjMHasu::daObjMHasu_c::Create() {
 
 /* 80C185A4-80C18600 000384 005C+00 1/0 0/0 0/0 .text
  * Execute__Q29nObjMHasu12daObjMHasu_cFPPA3_A4_f                */
-void nObjMHasu::daObjMHasu_c::Execute(f32 (**param_0)[3][4]) {
+void nObjMHasu::daObjMHasu_c::Execute(Mtx** param_0) {
     // NONMATCHING
 }
 

src/d/actor/d_a_obj_hsTarget.cpp

@@ -62,7 +62,7 @@ int daHsTarget_c::create() {
 
 /* 80C1F6B0-80C1F6C4 000370 0014+00 1/0 0/0 0/0 .text            Execute__12daHsTarget_cFPPA3_A4_f
  */
-int daHsTarget_c::Execute(f32 (**param_0)[3][4]) {
+int daHsTarget_c::Execute(Mtx** param_0) {
     *param_0 = &mpModel->getBaseTRMtx();
     return 1;
 }

src/d/actor/d_a_obj_ikada.cpp

@@ -409,7 +409,7 @@ COMPILER_STRIP_GATE(0x80C27560, &lit_3918);
 
 /* 80C270E0-80C27400 0007A0 0320+00 1/0 0/0 0/0 .text            Execute__12daObjIkada_cFPPA3_A4_f
  */
-void daObjIkada_c::Execute(f32 (**param_0)[3][4]) {
+void daObjIkada_c::Execute(Mtx** param_0) {
     // NONMATCHING
 }
 

src/d/actor/d_a_obj_ita.cpp

@@ -586,7 +586,7 @@ COMPILER_STRIP_GATE(0x80C292E4, &lit_4023);
 #pragma pop
 
 /* 80C28C70-80C290AC 0009F0 043C+00 1/0 0/0 0/0 .text            Execute__10daObjIta_cFPPA3_A4_f */
-void daObjIta_c::Execute(f32 (**param_0)[3][4]) {
+void daObjIta_c::Execute(Mtx** param_0) {
     // NONMATCHING
 }
 

src/d/actor/d_a_obj_kshutter.cpp

@@ -591,7 +591,7 @@ void daObjKshtr_c::event_proc_call2() {
 
 /* 80C4852C-80C48590 000AEC 0064+00 1/0 0/0 0/0 .text            Execute__12daObjKshtr_cFPPA3_A4_f
  */
-void daObjKshtr_c::Execute(f32 (**param_0)[3][4]) {
+void daObjKshtr_c::Execute(Mtx** param_0) {
     // NONMATCHING
 }