d_a_obj_ganonwall2 Matching (#2437)

* d_a_obj_ganonwall2 Mathcing

* d_a_obj_ganonwall2.cpp formatting

* d_a_obj_ganonwall.cpp formatting

Author: Hyenate

configure.py

@@ -1919,7 +1919,7 @@ def MatchingFor(*versions) -> bool:
     ActorRel(NonMatching, "d_a_obj_fw"),
     ActorRel(NonMatching, "d_a_obj_gadget"),
     ActorRel(MatchingFor("GZ2E01"), "d_a_obj_ganonwall"),
-    ActorRel(NonMatching, "d_a_obj_ganonwall2"),
+    ActorRel(MatchingFor("GZ2E01"), "d_a_obj_ganonwall2"),
     ActorRel(MatchingFor("GZ2E01"), "d_a_obj_gb"),
     ActorRel(NonMatching, "d_a_obj_geyser"),
     ActorRel(MatchingFor("GZ2E01"), "d_a_obj_glowSphere"),

include/d/actor/d_a_obj_ganonwall2.h

@@ -1,6 +1,7 @@
 #ifndef D_A_OBJ_GANONWALL2_H
 #define D_A_OBJ_GANONWALL2_H
 
+#include "d/d_bg_s_movebg_actor.h"
 #include "f_op/f_op_actor_mng.h"
 
 /**
@@ -11,19 +12,25 @@
  * @details
  *
  */
-class daObjGWall2_c : public fopAc_ac_c {
+class daObjGWall2_c : public dBgS_MoveBgActor {
 public:
     /* 80BF57D8 */ void initBaseMtx();
     /* 80BF5814 */ void setBaseMtx();
-    /* 80BF5878 */ void Create();
-    /* 80BF5950 */ void CreateHeap();
-    /* 80BF5AB4 */ void create1st();
-    /* 80BF5B74 */ void Execute(f32 (**)[3][4]);
-    /* 80BF5C0C */ void Draw();
-    /* 80BF6004 */ void Delete();
+    /* 80BF5878 */ int Create();
+    /* 80BF5950 */ int CreateHeap();
+    /* 80BF5AB4 */ int create1st();
+    /* 80BF5B74 */ int Execute(f32 (**)[3][4]);
+    /* 80BF5C0C */ int Draw();
+    /* 80BF6004 */ int Delete();
+
+    u32 getEventBit1() { return fopAcM_GetParamBit(this, 0, 10); }
 
 private:
-    /* 0x568 */ u8 field_0x568[0x5c0 - 0x568];
+    /* 0x5A0 */ request_of_phase_process_class mPhaseReq;
+    /* 0x5A8 */ J3DModel* mpModel;
+    /* 0x5AC */ mDoExt_btkAnm* mpBtkAnm;
+    /* 0x5B0 */ u16 mMatIdx;
+    /* 0x5B2 */ cXyz mSePos;
 };
 
 STATIC_ASSERT(sizeof(daObjGWall2_c) == 0x5c0);

src/d/actor/d_a_obj_ganonwall.cpp

@@ -65,8 +65,8 @@ int daObjGWall_c::Create() {
     fopAcM_setCullSizeBox2(this, mpModel->getModelData());
     cullSizeFar = 1000000.f;
     mMatIdx = 0xffff;
-    JUTNameTab* name_table = mpModel->mModelData->getMaterialTable().getMaterialName();
-    for (u16 i = 0; i < mpModel->mModelData->getMaterialTable().getMaterialNum(); i++) {
+    JUTNameTab* name_table = mpModel->getModelData()->getMaterialTable().getMaterialName();
+    for (u16 i = 0; i < mpModel->getModelData()->getMaterialTable().getMaterialNum(); i++) {
         if (strcmp(name_table->getName(i), l_matName) == 0) {
             mMatIdx = i;
         }
@@ -85,7 +85,7 @@ int daObjGWall_c::CreateHeap() {
     J3DAnmTextureSRTKey* btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, 7);
     mpBtkAnm = new mDoExt_btkAnm();
     if (mpBtkAnm == NULL ||
-        mpBtkAnm->init(&model_data->getMaterialTable(), btk, 1, 2, 1.0, 0, -1) == 0)
+        mpBtkAnm->init(model_data, btk, 1, 2, 1.0, 0, -1) == 0)
     {
         return 0;
     }
@@ -130,30 +130,27 @@ int daObjGWall_c::draw() {
     }
 
     g_env_light.settingTevStruct(0, &current.pos, &tevStr);
-    g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &tevStr);
+    g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
     mpBtkAnm->entry(mpModel->getModelData());
 
-    J3DModelData* model_data;
-    for (u16 i = 0;
-         model_data = mpModel->getModelData(), i < model_data->getMaterialTable().getMaterialNum();
-         i++)
-    {
-        J3DMaterial* mat = model_data->getMaterialTable().getMaterialNodePointer(i);
+    for (u16 i = 0; i < mpModel->getModelData()->getMaterialTable().getMaterialNum(); i++) {
+        J3DMaterial* mat = mpModel->getModelData()->getMaterialTable().getMaterialNodePointer(i);
         J3DFog* fog = mat->getPEBlock()->getFog();
         if (fog != NULL) {
             fog = mat->getPEBlock()->getFog();
-            fog->getFogInfo()->mColor.r = '\0';
-            fog->getFogInfo()->mColor.g = '\0';
-            fog->getFogInfo()->mColor.b = '\0';
-            fog->getFogInfo()->mStartZ = 1000.0f;
-            fog->getFogInfo()->mEndZ = 250000.0f;
+            J3DFogInfo* fog_info = fog->getFogInfo();
+            fog_info->mColor.r = 0;
+            fog_info->mColor.g = 0;
+            fog_info->mColor.b = 0;
+            fog_info->mStartZ = 1000.0f;
+            fog_info->mEndZ = 250000.0f;
         }
     }
 
     int hour = dKy_getdaytime_hour();
     float minute = dKy_getdaytime_minute();
     J3DGXColor* mat_tev_k_color =
-        mpModel->mModelData->getMaterialTable().getMaterialNodePointer(mMatIdx)->getTevKColor(1);
+        mpModel->getModelData()->getMaterialTable().getMaterialNodePointer(mMatIdx)->getTevKColor(1);
     int idx1 = l_idx[hour][0];
     int idx2 = l_idx[hour][1];
     mat_tev_k_color->r = (l_color[idx1].r +
@@ -204,8 +201,10 @@ static int daObjGWall_Create(daObjGWall_c* i_this) {
 
 /* 80BF56EC-80BF570C -00001 0020+00 1/0 0/0 0/0 .data            l_daObjGWall_Method */
 static actor_method_class l_daObjGWall_Method = {
-    (process_method_func)daObjGWall_Create,  (process_method_func)daObjGWall_Delete,
-    (process_method_func)daObjGWall_Execute, 0,
+    (process_method_func)daObjGWall_Create,  
+    (process_method_func)daObjGWall_Delete,
+    (process_method_func)daObjGWall_Execute, 
+    0,
     (process_method_func)daObjGWall_Draw,
 };