daObjKazeNeko_c OK (#2209)

zeldaret · Oct 14, 2024 · 9895999 · 9895999
1 parent e954b7b
commit 9895999
Show file tree

Hide file tree

Showing 4 changed files with 221 additions and 262 deletions.
diff --git a/config/GZ2E01/rels/d_a_obj_kazeneko/symbols.txt b/config/GZ2E01/rels/d_a_obj_kazeneko/symbols.txt
@@ -8,12 +8,12 @@ initCcCylinder__15daObjKazeNeko_cFv = .text:0x0000022C; // type:function size:0x
 setCcCylinder__15daObjKazeNeko_cFv = .text:0x000002B0; // type:function size:0x6C scope:global
 swingHead__15daObjKazeNeko_cFv = .text:0x0000031C; // type:function size:0xC4 scope:global
 getFirstVec__15daObjKazeNeko_cFP4cXyzi = .text:0x000003E0; // type:function size:0x50 scope:global
-createSolidHeap__FP10fopAc_ac_c = .text:0x00000430; // type:function size:0x100 scope:global
-daObjKazeNeko_Draw__FP15daObjKazeNeko_c = .text:0x00000530; // type:function size:0x118 scope:global
-daObjKazeNeko_Execute__FP15daObjKazeNeko_c = .text:0x00000648; // type:function size:0x188 scope:global
-daObjKazeNeko_IsDelete__FP15daObjKazeNeko_c = .text:0x000007D0; // type:function size:0x8 scope:global
-daObjKazeNeko_Delete__FP15daObjKazeNeko_c = .text:0x000007D8; // type:function size:0x130 scope:global
-daObjKazeNeko_Create__FP10fopAc_ac_c = .text:0x00000908; // type:function size:0x138 scope:global
+createSolidHeap__FP10fopAc_ac_c = .text:0x00000430; // type:function size:0x100 scope:local
+daObjKazeNeko_Draw__FP15daObjKazeNeko_c = .text:0x00000530; // type:function size:0x118 scope:local
+daObjKazeNeko_Execute__FP15daObjKazeNeko_c = .text:0x00000648; // type:function size:0x188 scope:local
+daObjKazeNeko_IsDelete__FP15daObjKazeNeko_c = .text:0x000007D0; // type:function size:0x8 scope:local
+daObjKazeNeko_Delete__FP15daObjKazeNeko_c = .text:0x000007D8; // type:function size:0x130 scope:local
+daObjKazeNeko_Create__FP10fopAc_ac_c = .text:0x00000908; // type:function size:0x138 scope:local
 __dt__8cM3dGCylFv = .text:0x00000A40; // type:function size:0x48 scope:global
 __dt__8cM3dGAabFv = .text:0x00000A88; // type:function size:0x48 scope:global
 __dt__10dCcD_GSttsFv = .text:0x00000AD0; // type:function size:0x5C scope:global
@@ -33,8 +33,8 @@ ccCylSrc$3894 = .rodata:0x00000040; // type:object size:0x44 scope:local
 @3962 = .rodata:0x0000008C; // type:object size:0x4 scope:local data:float
 @4119 = .rodata:0x00000090; // type:object size:0x8 scope:local
 @stringBase0 = .rodata:0x00000098; // type:object size:0x1A scope:local data:string_table
-l_arcName = .data:0x00000000; // type:object size:0x4 scope:global
-l_daObjKazeNeko_Method = .data:0x00000004; // type:object size:0x20 scope:global
+l_arcName = .data:0x00000000; // type:object size:0x4 scope:local
+l_daObjKazeNeko_Method = .data:0x00000004; // type:object size:0x20 scope:local
 g_profile_Obj_KazeNeko = .data:0x00000024; // type:object size:0x30 scope:global
 __vt__10cCcD_GStts = .data:0x00000054; // type:object size:0xC scope:global
 __vt__10dCcD_GStts = .data:0x00000060; // type:object size:0xC scope:global

diff --git a/configure.py b/configure.py
@@ -1844,7 +1844,7 @@ def JSystemLib(lib_name, objects, progress_category="third_party"):
     ActorRel(NonMatching, "d_a_obj_kamakiri"),
     ActorRel(NonMatching, "d_a_obj_kantera"),
     ActorRel(NonMatching, "d_a_obj_katatsumuri"),
-    ActorRel(NonMatching, "d_a_obj_kazeneko"),
+    ActorRel(Matching, "d_a_obj_kazeneko"),
     ActorRel(NonMatching, "d_a_obj_kbox"),
     ActorRel(NonMatching, "d_a_obj_key"),
     ActorRel(NonMatching, "d_a_obj_keyhole"),

diff --git a/include/d/actor/d_a_obj_kazeneko.h b/include/d/actor/d_a_obj_kazeneko.h
@@ -1,7 +1,24 @@
 #ifndef D_A_OBJ_KAZENEKO_H
 #define D_A_OBJ_KAZENEKO_H
 
-#include "f_op/f_op_actor_mng.h"
+#include "f_op/f_op_actor.h"
+#include "d/d_cc_d.h"
+
+struct KazoNekoAttr {
+    f32 mCylRadius;
+    f32 mCylHeight;
+    f32 field_0x08;
+    f32 field_0x0c;
+    f32 field_0x10;
+    f32 field_0x14;
+    f32 field_0x18;
+    f32 field_0x1c;
+    f32 field_0x20;
+    u8 field_0x24;
+    u8 field_0x25;
+    s16 field_0x26;
+    int field_0x28;
+};
 
 /**
  * @ingroup actors-objects
@@ -20,13 +37,36 @@ class daObjKazeNeko_c : public fopAc_ac_c {
     /* 80C3CB10 */ void setCcCylinder();
     /* 80C3CB7C */ void swingHead();
     /* 80C3CC40 */ void getFirstVec(cXyz*, int);
+    inline int createHeap();
+    inline int draw();
+    inline int execute();
+    inline int create();
+    inline ~daObjKazeNeko_c();
 
-    static u8 const M_attr[44];
+    const KazoNekoAttr& attr() { return M_attr; }
+
+    static KazoNekoAttr const M_attr;
 private:
-    /* 0x568 */ u8 field_0x568[0x754 - 0x568];
+    /* 0x568 */ J3DModel* mModel;
+    /* 0x56C */ J3DModel* mArmModels[4];
+    /* 0x57C */ request_of_phase_process_class mPhase;
+    /* 0x584 */ Mtx mMtx;
+    /* 0x5B4 */ dCcD_Stts mStts;
+    /* 0x5F0 */ dCcD_Cyl mCyl;
+    /* 0x72c */ cXyz field_0x72c;
+    /* 0x738 */ int field_0x738;
+    /* 0x73C */ f32 field_0x73c;
+    /* 0x740 */ f32 field_0x740;
+    /* 0x744 */ f32 field_0x744;
+    /* 0x748 */ s16 field_0x748;
+    /* 0x74A */ s16 field_0x74a;
+    /* 0x74C */ s16 field_0x74c;
+    /* 0x74E */ s16 field_0x74e;
+    /* 0x750 */ s16 field_0x750;
+    /* 0x752 */ u8 field_0x752;
+    /* 0x753 */ u8 field_0x753;
 };
 
 STATIC_ASSERT(sizeof(daObjKazeNeko_c) == 0x754);
 
-
 #endif /* D_A_OBJ_KAZENEKO_H */