d_a_obj_riverrock OK (#2279)

config/GZ2E01/rels/d_a_obj_riverrock/symbols.txt

@@ -6,8 +6,8 @@ __destroy_global_chain = .text:0x00000094; // type:function size:0x58 scope:glob
 __ct__20daObjRIVERROCK_HIO_cFv = .text:0x000000EC; // type:function size:0x28 scope:global
 initCcCylinder__16daObjRIVERROCK_cFv = .text:0x00000114; // type:function size:0x60 scope:global
 SetCcCyl__16daObjRIVERROCK_cFv = .text:0x00000174; // type:function size:0x60 scope:global
-daObjRIVERROCK_Create__FP10fopAc_ac_c = .text:0x000001D4; // type:function size:0x20 scope:global
-daObjRIVERROCK_Delete__FP16daObjRIVERROCK_c = .text:0x000001F4; // type:function size:0x24 scope:global
+daObjRIVERROCK_Create__FP10fopAc_ac_c = .text:0x000001D4; // type:function size:0x20 scope:local
+daObjRIVERROCK_Delete__FP16daObjRIVERROCK_c = .text:0x000001F4; // type:function size:0x24 scope:local
 BreakWaitAction__16daObjRIVERROCK_cFv = .text:0x00000218; // type:function size:0xC4 scope:global
 CheckBG__16daObjRIVERROCK_cFv = .text:0x000002DC; // type:function size:0x380 scope:global
 BreakMoveAction__16daObjRIVERROCK_cFv = .text:0x0000065C; // type:function size:0x84 scope:global
@@ -17,13 +17,13 @@ Action__16daObjRIVERROCK_cFv = .text:0x00000808; // type:function size:0x44 scop
 BreakSet__16daObjRIVERROCK_cFv = .text:0x0000084C; // type:function size:0x398 scope:global
 WaitAction__16daObjRIVERROCK_cFv = .text:0x00000BE4; // type:function size:0x40 scope:global
 setBaseMtx__16daObjRIVERROCK_cFv = .text:0x00000C24; // type:function size:0xF8 scope:global
-daObjRIVERROCK_Draw__FP16daObjRIVERROCK_c = .text:0x00000D1C; // type:function size:0x2C scope:global
-daObjRIVERROCK_Execute__FP16daObjRIVERROCK_c = .text:0x00000D48; // type:function size:0x20 scope:global
+daObjRIVERROCK_Draw__FP16daObjRIVERROCK_c = .text:0x00000D1C; // type:function size:0x2C scope:local
+daObjRIVERROCK_Execute__FP16daObjRIVERROCK_c = .text:0x00000D48; // type:function size:0x20 scope:local
 CreateHeap__16daObjRIVERROCK_cFv = .text:0x00000D68; // type:function size:0x78 scope:global
 create__16daObjRIVERROCK_cFv = .text:0x00000DE0; // type:function size:0x35C scope:global
 __dt__8cM3dGCylFv = .text:0x0000113C; // type:function size:0x48 scope:global
 __dt__8cM3dGAabFv = .text:0x00001184; // type:function size:0x48 scope:global
-daObjRIVERROCK_IsDelete__FP16daObjRIVERROCK_c = .text:0x000011CC; // type:function size:0x8 scope:global
+daObjRIVERROCK_IsDelete__FP16daObjRIVERROCK_c = .text:0x000011CC; // type:function size:0x8 scope:local
 Create__16daObjRIVERROCK_cFv = .text:0x000011D4; // type:function size:0x60 scope:global
 Execute__16daObjRIVERROCK_cFPPA3_A4_f = .text:0x00001234; // type:function size:0xCC scope:global
 Draw__16daObjRIVERROCK_cFv = .text:0x00001300; // type:function size:0x84 scope:global
@@ -62,14 +62,14 @@ ccCylSrc$3635 = .rodata:0x00000004; // type:object size:0x44 scope:local
 @4119 = .rodata:0x000000B0; // type:object size:0x4 scope:local
 @4120 = .rodata:0x000000B4; // type:object size:0x4 scope:local
 @stringBase0 = .rodata:0x000000B8; // type:object size:0x2A scope:local data:string_table
-l_arcName = .data:0x00000000; // type:object size:0x4 scope:global
-l_daObjRIVERROCK_Method = .data:0x00000004; // type:object size:0x20 scope:global
+l_arcName = .data:0x00000000; // type:object size:0x4 scope:local
+l_daObjRIVERROCK_Method = .data:0x00000004; // type:object size:0x20 scope:local
 g_profile_Obj_RIVERROCK = .data:0x00000024; // type:object size:0x30 scope:global
 __vt__8cM3dGCyl = .data:0x00000054; // type:object size:0xC scope:global
 __vt__8cM3dGAab = .data:0x00000060; // type:object size:0xC scope:global
 __vt__16daObjRIVERROCK_c = .data:0x0000006C; // type:object size:0x28 scope:global
 __vt__20daObjRIVERROCK_HIO_c = .data:0x00000094; // type:object size:0xC scope:global
 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
-lbl_603_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte
+lbl_603_bss_8 = .bss:0x00000008; // type:object size:0x1 scope:local data:byte
 @3626 = .bss:0x0000000C; // type:object size:0xC scope:local
-l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global data:byte
+l_HIO = .bss:0x00000018; // type:object size:0x10 scope:local data:byte

configure.py

@@ -1968,7 +1968,7 @@ config.libs = [
     ActorRel(Matching, "d_a_obj_rcircle"),
     ActorRel(NonMatching, "d_a_obj_rfHole"),
     ActorRel(Matching, "d_a_obj_rgate"),
-    ActorRel(NonMatching, "d_a_obj_riverrock"),
+    ActorRel(Matching, "d_a_obj_riverrock"),
     ActorRel(Matching, "d_a_obj_rock"),
     ActorRel(NonMatching, "d_a_obj_rotBridge"),
     ActorRel(NonMatching, "d_a_obj_rotTrap"),

include/d/actor/d_a_obj_riverrock.h

@@ -1,6 +1,8 @@
 #ifndef D_A_OBJ_RIVERROCK_H
 #define D_A_OBJ_RIVERROCK_H
 
+#include "d/d_bg_s_movebg_actor.h"
+#include "d/d_cc_d.h"
 #include "f_op/f_op_actor_mng.h"
 
 /**
@@ -11,8 +13,20 @@
  * @details
  *
  */
-class daObjRIVERROCK_c : public fopAc_ac_c {
+class daObjRIVERROCK_c : public dBgS_MoveBgActor {
 public:
+    typedef enum {
+        ACTION_WAIT,
+        ACTION_BREAK,
+    } ActionEnum;
+
+    typedef enum {
+        BREAK_WAIT,
+        BREAK_MOVE,
+        BREAK_BROKEN,
+        BREAK_3,
+    } BreakSubAction;
+
     /* 80CBC6F4 */ void initCcCylinder();
     /* 80CBC754 */ void SetCcCyl();
     /* 80CBC7F8 */ void BreakWaitAction();
@@ -24,15 +38,38 @@ public:
     /* 80CBCE2C */ void BreakSet();
     /* 80CBD1C4 */ void WaitAction();
     /* 80CBD204 */ void setBaseMtx();
-    /* 80CBD348 */ void CreateHeap();
-    /* 80CBD3C0 */ void create();
-    /* 80CBD7B4 */ void Create();
-    /* 80CBD814 */ void Execute(f32 (**)[3][4]);
-    /* 80CBD8E0 */ void Draw();
-    /* 80CBD964 */ void Delete();
+    /* 80CBD348 */ int CreateHeap();
+    /* 80CBD3C0 */ int create();
+    /* 80CBD7B4 */ int Create();
+    /* 80CBD814 */ int Execute(Mtx**);
+    /* 80CBD8E0 */ int Draw();
+    /* 80CBD964 */ int Delete();
 
 private:
-    /* 0x568 */ u8 field_0x568[0x79c - 0x568];
+    /* 0x5A0 */ ActionEnum mAction;
+    /* 0x5A4 */ BreakSubAction mBreakSubAction;
+    /* 0x5A8 */ u8 field_0x5a8;
+    /* 0x5A9 */ u8 field_0x5a9;
+    /* 0x5AA */ s16 field_0x5aa;
+    /* 0x5AC */ int field_0x5ac;
+    /* 0x5B0 */ s16 field_0x5b0;
+    /* 0x5B2 */ s16 field_0x5b2;
+    /* 0x5B4 */ s16 field_0x5b4;
+    /* 0x5B6 */ s16 field_0x5b6;
+    /* 0x5B8 */ s16 field_0x5b8;
+    /* 0x5BA */ u8 field_0x5ba[0x5c4 - 0x5ba];
+    /* 0x5C4 */ cXyz field_0x5c4;
+    /* 0x5D0 */ cXyz field_0x5d0;
+    /* 0x5DC */ cXyz field_0x5dc;
+    /* 0x5E8 */ csXyz field_0x5e8;
+    /* 0x5EE */ bool field_0x5ee;
+    /* 0x5F0 */ Z2SoundObjSimple mSoundObj;
+    /* 0x610 */ int field_0x610;
+    /* 0x614 */ J3DModel* mModel;
+    /* 0x618 */ request_of_phase_process_class mPhase;
+    /* 0x620 */ dCcD_Stts mStts;
+    /* 0x65C */ dCcD_Cyl mCyl;
+    /* 0x798 */ bool mHIONeedDelete;
 };
 
 STATIC_ASSERT(sizeof(daObjRIVERROCK_c) == 0x79c);
@@ -40,7 +77,11 @@ STATIC_ASSERT(sizeof(daObjRIVERROCK_c) == 0x79c);
 class daObjRIVERROCK_HIO_c {
 public:
     /* 80CBC6CC */ daObjRIVERROCK_HIO_c();
-    /* 80CBD9C4 */ ~daObjRIVERROCK_HIO_c();
+    /* 80CBD9C4 */ virtual ~daObjRIVERROCK_HIO_c() {}
+
+    /* 0x4 */ s8 field_0x4;
+    /* 0x8 */ f32 field_0x8;
+    /* 0xC */ f32 field_0xc;
 };