daObjBATTA Equivalent (#2563)

Author: hatal175

config/GZ2E01/rels/d_a_obj_batta/symbols.txt

@@ -130,6 +130,6 @@ __vt__12daObjBATTA_c = .data:0x000001E8; // type:object size:0xC scope:global
 __vt__12J3DFrameCtrl = .data:0x000001F4; // type:object size:0xC scope:global
 __vt__16daObj_BattaHIO_c = .data:0x00000200; // type:object size:0xC scope:global
 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
-lbl_403_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte
+l_HIOInit = .bss:0x00000008; // type:object size:0x1 scope:local data:byte
 @3769 = .bss:0x0000000C; // type:object size:0xC scope:local
 l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float

config/GZ2J01/rels/d_a_obj_batta/symbols.txt

@@ -129,6 +129,6 @@ __vt__12daObjBATTA_c = .data:0x000001E8; // type:object size:0xC scope:global
 __vt__12J3DFrameCtrl = .data:0x000001F4; // type:object size:0xC scope:global
 __vt__16daObj_BattaHIO_c = .data:0x00000200; // type:object size:0xC scope:global
 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
-lbl_403_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte
+l_HIOInit = .bss:0x00000008; // type:object size:0x1 data:byte scope:local
 @3769 = .bss:0x0000000C; // type:object size:0xC scope:local
 l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float

config/GZ2P01/rels/d_a_obj_batta/symbols.txt

@@ -129,6 +129,6 @@ __vt__12daObjBATTA_c = .data:0x000001E8; // type:object size:0xC scope:global
 __vt__12J3DFrameCtrl = .data:0x000001F4; // type:object size:0xC scope:global
 __vt__16daObj_BattaHIO_c = .data:0x00000200; // type:object size:0xC scope:global
 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
-lbl_403_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte
+l_HIOInit = .bss:0x00000008; // type:object size:0x1 data:byte scope:local
 @3769 = .bss:0x0000000C; // type:object size:0xC scope:local
 l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float

config/RZDE01_00/rels/d_a_obj_batta/symbols.txt

@@ -133,6 +133,6 @@ lbl_403_data_424 = .data:0x00000424; // type:object size:0x4 data:string
 lbl_403_data_428 = .data:0x00000428; // type:object size:0x4 data:string
 lbl_403_data_42C = .data:0x0000042C; // type:object size:0x4 data:string
 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
-lbl_403_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte
+l_HIOInit = .bss:0x00000008; // type:object size:0x1 data:byte scope:local
 @93433 = .bss:0x0000000C; // type:object size:0xC scope:local
 l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float

configure.py

@@ -1880,7 +1880,7 @@ def MatchingFor(*versions) -> bool:
     ActorRel(MatchingFor("GZ2E01"), "d_a_obj_avalanche"),
     ActorRel(MatchingFor("GZ2E01"), "d_a_obj_balloon"),
     ActorRel(MatchingFor("GZ2E01"), "d_a_obj_barDesk"),
-    ActorRel(NonMatching, "d_a_obj_batta"),
+    ActorRel(Equivalent, "d_a_obj_batta"),
     ActorRel(MatchingFor("GZ2E01"), "d_a_obj_bbox"),
     ActorRel(MatchingFor("GZ2E01"), "d_a_obj_bed"),
     ActorRel(NonMatching, "d_a_obj_bemos"),

include/d/actor/d_a_obj_batta.h

@@ -1,7 +1,9 @@
 #ifndef D_A_OBJ_BATTA_H
 #define D_A_OBJ_BATTA_H
 
-#include "f_op/f_op_actor_mng.h"
+#include "d/actor/d_a_player.h"
+#include "d/d_bg_s_acch.h"
+#include "d/d_cc_d.h"
 #include "d/d_insect.h"
 
 /**
@@ -14,6 +16,8 @@
  */
 class daObjBATTA_c : public dInsect_c {
 public:
+    typedef void (daObjBATTA_c::*actionFunc)();
+
     /* 80BA9E5C */ void setAction(void (daObjBATTA_c::*)());
     /* 80BAA1C8 */ void wait();
     /* 80BAA47C */ void turn();
@@ -27,21 +31,54 @@ class daObjBATTA_c : public dInsect_c {
     /* 80BABA98 */ void batta_setParticle();
     /* 80BABCA4 */ void action();
     /* 80BABD6C */ void hit_check();
-    /* 80BABE20 */ void execute();
-    /* 80BABFA4 */ void _delete();
+    /* 80BABE20 */ int execute();
+    /* 80BABFA4 */ int _delete();
     /* 80BAC00C */ void mtx_set();
-    /* 80BAC194 */ void create();
+    /* 80BAC194 */ int create();
+
+    inline int CreateHeap();
+    inline int draw();
+
+    bool checkAction(actionFunc i_func) {
+        return mActionFunc == i_func;
+    }
 
 private:
-    /* 0x590 */ u8 field_0x568[0x9f8 - 0x590];
+    /* 0x590 */ Z2Creature mCreature;
+    /* 0x620 */ mDoExt_McaMorfSO* mpMorf;
+    /* 0x624 */ mDoExt_brkAnm* mBrk;
+    /* 0x628 */ mDoExt_btkAnm* mBtk;
+    /* 0x62C */ dBgS_AcchCir mAcchCir;
+    /* 0x66C */ dBgS_ObjAcch mAcch;
+    /* 0x844 */ dCcD_Stts mStts;
+    /* 0x890 */ dCcD_Sph mSph;
+    /* 0x8B8 */ daPy_boomerangMove_c mBoomerangMove;
+    /* 0x9C4 */ request_of_phase_process_class mPhase;
+    /* 0x9CC */ f32 mParticleScale;
+    /* 0x9D0 */ actionFunc mActionFunc;
+    /* 0x9DC */ actionFunc mPrevActionFunc;
+    /* 0x9E8 */ int field_0x9e8;
+    /* 0x9EC */ s16 field_0x9ec;
+    /* 0x9EE */ u16 mActionTimer;
+    /* 0x9F0 */ u8 field_0x9f0;
+    /* 0x9F1 */ u8 field_0x9f1;
+    /* 0x9F2 */ u8 field_0x9f2;
+    /* 0x9F3 */ u8 mSex;
+    /* 0x9F4 */ u8 mIsHIOOwner;
 };
 
 STATIC_ASSERT(sizeof(daObjBATTA_c) == 0x9f8);
 
-class daObj_BattaHIO_c {
+class daObj_BattaHIO_c : public JORReflexible {
 public:
     /* 80BA9E2C */ daObj_BattaHIO_c();
-    /* 80BAC874 */ ~daObj_BattaHIO_c();
+    /* 80BAC874 */ virtual ~daObj_BattaHIO_c() {}
+
+    void genMessage(JORMContext* ctx);
+
+    /* 0x4 */ s8 mId;
+    /* 0x8 */ f32 mModelScaleFemale;
+    /* 0xC */ f32 mModelScaleMale;
 };
 
 #endif /* D_A_OBJ_BATTA_H */