d_a_obj_smtile OK (#2276)

zeldaret · Dec 29, 2024 · 593f1d1 · 593f1d1
1 parent 3630058
commit 593f1d1
Show file tree

Hide file tree

Showing 4 changed files with 321 additions and 296 deletions.
diff --git a/config/GZ2E01/rels/d_a_obj_smtile/symbols.txt b/config/GZ2E01/rels/d_a_obj_smtile/symbols.txt
@@ -17,11 +17,11 @@ setDstPos__14daObj_SMTile_cFv = .text:0x00000988; // type:function size:0x1E0 sc
 setPrtcls__14daObj_SMTile_cFii = .text:0x00000B68; // type:function size:0x1D4 scope:global
 touchPrtcls__14daObj_SMTile_cFf = .text:0x00000D3C; // type:function size:0x2AC scope:global
 setMtx__14daObj_SMTile_cFv = .text:0x00000FE8; // type:function size:0x74 scope:global
-daObj_SMTile_Create__FPv = .text:0x0000105C; // type:function size:0x20 scope:global
-daObj_SMTile_Delete__FPv = .text:0x0000107C; // type:function size:0x20 scope:global
-daObj_SMTile_Execute__FPv = .text:0x0000109C; // type:function size:0x20 scope:global
-daObj_SMTile_Draw__FPv = .text:0x000010BC; // type:function size:0x20 scope:global
-daObj_SMTile_IsDelete__FPv = .text:0x000010DC; // type:function size:0x8 scope:global
+daObj_SMTile_Create__FPv = .text:0x0000105C; // type:function size:0x20 scope:local
+daObj_SMTile_Delete__FPv = .text:0x0000107C; // type:function size:0x20 scope:local
+daObj_SMTile_Execute__FPv = .text:0x0000109C; // type:function size:0x20 scope:local
+daObj_SMTile_Draw__FPv = .text:0x000010BC; // type:function size:0x20 scope:local
+daObj_SMTile_IsDelete__FPv = .text:0x000010DC; // type:function size:0x8 scope:local
 cLib_calcTimer<i>__FPi = .text:0x000010E4; // type:function size:0x1C scope:global
 __sinit_d_a_obj_smtile_cpp = .text:0x00001100; // type:function size:0x40 scope:local
 __dt__20daObj_SMTile_Param_cFv = .text:0x00001140; // type:function size:0x48 scope:global
@@ -38,14 +38,14 @@ m__20daObj_SMTile_Param_c = .rodata:0x00000000; // type:object size:0x8 scope:gl
 id$4105 = .rodata:0x00000020; // type:object size:0x8 scope:local
 @4194 = .rodata:0x00000028; // type:object size:0x4 scope:local
 @stringBase0 = .rodata:0x0000002C; // type:object size:0xA scope:local data:string_table
-l_bmdData = .data:0x00000000; // type:object size:0x8 scope:global
-l_resNameList = .data:0x00000008; // type:object size:0x8 scope:global
-l_tileMoveData = .data:0x00000010; // type:object size:0x54 scope:global data:byte
-daObj_SMTile_MethodTable = .data:0x00000064; // type:object size:0x20 scope:global
+l_bmdData = .data:0x00000000; // type:object size:0x8 scope:local
+l_resNameList = .data:0x00000008; // type:object size:0x8 scope:local
+l_tileMoveData = .data:0x00000010; // type:object size:0x54 scope:local data:byte
+daObj_SMTile_MethodTable = .data:0x00000064; // type:object size:0x20 scope:local
 g_profile_OBJ_SMTILE = .data:0x00000084; // type:object size:0x30 scope:global
 __vt__12J3DFrameCtrl = .data:0x000000B4; // type:object size:0xC scope:global
 __vt__14daObj_SMTile_c = .data:0x000000C0; // type:object size:0xC scope:global
 __vt__20daObj_SMTile_Param_c = .data:0x000000CC; // type:object size:0xC scope:global
 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
 @3805 = .bss:0x00000008; // type:object size:0xC scope:local
-l_HIO = .bss:0x00000014; // type:object size:0x4 scope:global data:4byte
+l_HIO = .bss:0x00000014; // type:object size:0x4 scope:local data:4byte
diff --git a/configure.py b/configure.py
@@ -1989,7 +1989,7 @@ def MatchingFor(*versions):
     ActorRel(NonMatching, "d_a_obj_smallkey"),
     ActorRel(NonMatching, "d_a_obj_smgdoor"),
     ActorRel(Matching, "d_a_obj_smoke"),
-    ActorRel(NonMatching, "d_a_obj_smtile"),
+    ActorRel(Matching, "d_a_obj_smtile"),
     ActorRel(Matching, "d_a_obj_smw_stone"),
     ActorRel(Matching, "d_a_obj_snowEffTag"),
     ActorRel(Matching, "d_a_obj_snow_soup"),

diff --git a/include/d/actor/d_a_obj_smtile.h b/include/d/actor/d_a_obj_smtile.h
@@ -12,30 +12,48 @@
  *
  */
 class daObj_SMTile_c : public fopAc_ac_c {
+private:
+    /* 0x568 */ mDoExt_brkAnm mBrk;
+    /* 0x580 */ int field_0x580;
+    /* 0x584 */ request_of_phase_process_class mPhase;
+    /* 0x58C */ J3DModel* mModel;
+    /* 0x590 */ cXyz field_0x590[21];
+    /* 0x68C */ cXyz field_0x68c[21];
+    /* 0x788 */ cXyz field_0x788[42];
+    /* 0x980 */ int mParticleTimers[21];
+    /* 0x9D4 */ int field_0x9d4[21];
+    /* 0xA28 */ int field_0xa28[21];
+    /* 0xA7C */ int field_0xa7c;
+    /* 0xA80 */ JPABaseEmitter* mEmitters[21];
+    /* 0xAD4 */ u32 mParticleIds[21];
+    /* 0xB28 */ u8 mType;
+    /* 0xB29 */ u8 field_0xb29;
+    /* 0xB2A */ u8 field_0xb2a;
+    /* 0xB2B */ u8 field_0xb2b;
 public:
-    /* 80CDD2AC */ ~daObj_SMTile_c();
-    /* 80CDD3E8 */ void create();
-    /* 80CDD5CC */ void CreateHeap();
-    /* 80CDD6E8 */ void Delete();
-    /* 80CDD71C */ void Execute();
-    /* 80CDDA98 */ void Draw();
-    /* 80CDDB28 */ void createHeapCallBack(fopAc_ac_c*);
+    /* 80CDD2AC */ virtual ~daObj_SMTile_c();
+    /* 80CDD3E8 */ int create();
+    /* 80CDD5CC */ int CreateHeap();
+    /* 80CDD6E8 */ int Delete();
+    /* 80CDD71C */ int Execute();
+    /* 80CDDA98 */ int Draw();
+    /* 80CDDB28 */ static int createHeapCallBack(fopAc_ac_c*);
     /* 80CDDB48 */ void setDstPos();
     /* 80CDDD28 */ void setPrtcls(int, int);
     /* 80CDDEFC */ void touchPrtcls(f32);
     /* 80CDE1A8 */ void setMtx();
 
-private:
-    /* 0x568 */ u8 field_0x568[0xb30 - 0x568];
+    u8 getType() { return 0; }
+    u8 getBitSW() { return (fopAcM_GetParam(this) & 0xff00) >> 8; }
 };
 
 STATIC_ASSERT(sizeof(daObj_SMTile_c) == 0xb30);
 
 class daObj_SMTile_Param_c {
 public:
-    /* 80CDE300 */ ~daObj_SMTile_Param_c();
+    /* 80CDE300 */ virtual ~daObj_SMTile_Param_c() {}
 
-    static u8 const m[8];
+    static f32 const m[2];
 };