d_a_obj_Y_taihou equivalent (#2303)

* Transfer of Y_taihou work to cleaner and newer branch

* d_a_obj_Y_taihou nearly equivalent except for 2 functions

* Functionally correct d_a_obj_Y_taihou, but some issues remain

* d_a_obj_Y_taihou equivalent now; many thanks hatal!

* Update configure(dot)py and the config files for Y_taihou

config/GZ2E01/rels/d_a_obj_Y_taihou/splits.txt

@@ -16,6 +16,6 @@ REL/global_destructor_chain.c:
 
 d/actor/d_a_obj_Y_taihou.cpp:
 	.text       start:0x000000EC end:0x00001744
-	.rodata     start:0x00000000 end:0x0000008C
+	.rodata     start:0x00000000 end:0x00000089
 	.data       start:0x00000000 end:0x00000130
 	.bss        start:0x00000008 end:0x000000D0

config/GZ2E01/rels/d_a_obj_Y_taihou/symbols.txt

@@ -3,10 +3,10 @@ _epilog = .text:0x0000002C; // type:function size:0x2C scope:global
 _unresolved = .text:0x00000058; // type:function size:0x20 scope:global
 __register_global_object = .text:0x00000078; // type:function size:0x1C scope:global
 __destroy_global_chain = .text:0x00000094; // type:function size:0x58 scope:global
-ccHitCallback__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf = .text:0x000000EC; // type:function size:0x154 scope:global
-pushPullcallBack__FP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel = .text:0x00000240; // type:function size:0xE0 scope:global
+ccHitCallback__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf = .text:0x000000EC; // type:function size:0x154 scope:local
+pushPullcallBack__FP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel = .text:0x00000240; // type:function size:0xE0 scope:local
 __dt__4cXyzFv = .text:0x00000320; // type:function size:0x3C scope:global
-searchIronBallCallback__FPvPv = .text:0x0000035C; // type:function size:0x8C scope:global
+searchIronBallCallback__FPvPv = .text:0x0000035C; // type:function size:0x8C scope:local
 create1st__14daObjYtaihou_cFv = .text:0x000003E8; // type:function size:0xC8 scope:global
 setIronBall__14daObjYtaihou_cFP12daObjCarry_c = .text:0x000004B0; // type:function size:0x58 scope:global
 getEvent__14daObjYtaihou_cFUc = .text:0x00000508; // type:function size:0x14 scope:global
@@ -22,13 +22,13 @@ Create__14daObjYtaihou_cFv = .text:0x00000FE4; // type:function size:0xB0 scope:
 Execute__14daObjYtaihou_cFPPA3_A4_f = .text:0x00001094; // type:function size:0xB8 scope:global
 Draw__14daObjYtaihou_cFv = .text:0x0000114C; // type:function size:0xD0 scope:global
 Delete__14daObjYtaihou_cFv = .text:0x0000121C; // type:function size:0x6C scope:global
-daObjYtaihou_create1st__FP14daObjYtaihou_c = .text:0x00001288; // type:function size:0x11C scope:global
+daObjYtaihou_create1st__FP14daObjYtaihou_c = .text:0x00001288; // type:function size:0x11C scope:local
 __dt__8cM3dGCylFv = .text:0x000013A4; // type:function size:0x48 scope:global
 __dt__8cM3dGAabFv = .text:0x000013EC; // type:function size:0x48 scope:global
 __dt__10dCcD_GSttsFv = .text:0x00001434; // type:function size:0x5C scope:global
-daObjYtaihou_MoveBGDelete__FP14daObjYtaihou_c = .text:0x00001490; // type:function size:0x20 scope:global
-daObjYtaihou_MoveBGExecute__FP14daObjYtaihou_c = .text:0x000014B0; // type:function size:0x20 scope:global
-daObjYtaihou_MoveBGDraw__FP14daObjYtaihou_c = .text:0x000014D0; // type:function size:0x2C scope:global
+daObjYtaihou_MoveBGDelete__FP14daObjYtaihou_c = .text:0x00001490; // type:function size:0x20 scope:local
+daObjYtaihou_MoveBGExecute__FP14daObjYtaihou_c = .text:0x000014B0; // type:function size:0x20 scope:local
+daObjYtaihou_MoveBGDraw__FP14daObjYtaihou_c = .text:0x000014D0; // type:function size:0x2C scope:local
 __dt__10cCcD_GSttsFv = .text:0x000014FC; // type:function size:0x48 scope:global
 __dt__17dEvLib_callback_cFv = .text:0x00001544; // type:function size:0x48 scope:global
 eventStart__17dEvLib_callback_cFv = .text:0x0000158C; // type:function size:0x8 scope:global
@@ -65,10 +65,10 @@ l_shotSmokeOffset$3962 = .rodata:0x00000054; // type:object size:0xC scope:local
 @4109 = .rodata:0x00000070; // type:object size:0x4 scope:local
 l_cc_offset$4147 = .rodata:0x00000074; // type:object size:0xC scope:local
 @stringBase0 = .rodata:0x00000080; // type:object size:0x9 scope:local data:string_table
-l_arcName = .data:0x00000000; // type:object size:0x4 scope:global
-l_cc_cyl_src = .data:0x00000004; // type:object size:0x44 scope:global
+l_arcName = .data:0x00000000; // type:object size:0x4 scope:local
+l_cc_cyl_src = .data:0x00000004; // type:object size:0x44 scope:local
 l_offsetAngle$3829 = .data:0x00000048; // type:object size:0x8 scope:local
-daObjYtaihou_METHODS = .data:0x00000050; // type:object size:0x20 scope:global
+daObjYtaihou_METHODS = .data:0x00000050; // type:object size:0x20 scope:local
 g_profile_Obj_Ytaihou = .data:0x00000070; // type:object size:0x30 scope:global
 __vt__10cCcD_GStts = .data:0x000000A0; // type:object size:0xC scope:global
 __vt__10dCcD_GStts = .data:0x000000AC; // type:object size:0xC scope:global
@@ -95,7 +95,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa
 @1010 = .bss:0x00000040; // type:object size:0x1 scope:local
 @1009 = .bss:0x00000044; // type:object size:0x1 scope:local
 l_wheelMinR$3836 = .bss:0x00000048; // type:object size:0x4 scope:local data:float
-lbl_396_bss_4C = .bss:0x0000004C; // type:object size:0x1 data:byte
+lbl_396_bss_4C = .bss:0x0000004C; // type:object size:0x1 scope:local data:byte
 @3951 = .bss:0x00000050; // type:object size:0xC scope:local
 l_effectScale$3950 = .bss:0x00000060; // type:object size:0xC scope:local
 sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x0000006C; // type:object size:0x4 scope:global

configure.py

@@ -1827,7 +1827,7 @@ config.libs = [
     ActorRel(MatchingFor("GZ2E01"), "d_a_obj_Lv5Key"),
     ActorRel(Equivalent, "d_a_obj_Turara"),
     ActorRel(MatchingFor("GZ2E01"), "d_a_obj_TvCdlst"),
-    ActorRel(NonMatching, "d_a_obj_Y_taihou"),
+    ActorRel(Equivalent, "d_a_obj_Y_taihou"), # weak func ordering.
     ActorRel(NonMatching, "d_a_obj_amiShutter"),
     ActorRel(MatchingFor("GZ2E01"), "d_a_obj_ari"),
     ActorRel(MatchingFor("GZ2E01"), "d_a_obj_automata"),

include/d/actor/d_a_obj_Y_taihou.h

@@ -1,8 +1,9 @@
 #ifndef D_A_OBJ_Y_TAIHOU_H
 #define D_A_OBJ_Y_TAIHOU_H
 
-#include "f_op/f_op_actor_mng.h"
+#include "d/d_bg_s_movebg_actor.h"
 #include "d/actor/d_a_obj_carry.h"
+#include "d/d_event_lib.h"
 
 /**
  * @ingroup actors-objects
@@ -12,27 +13,43 @@
  * @details
  *
  */
-class daObjYtaihou_c : public fopAc_ac_c {
+class daObjYtaihou_c : public dBgS_MoveBgActor, public request_of_phase_process_class, public dEvLib_callback_c {
 public:
-    /* 80B9FDE8 */ void create1st();
+    daObjYtaihou_c() : dEvLib_callback_c(this) { mIronBallId = -1; }
+    /* 80B9FDE8 */ int create1st();
     /* 80B9FEB0 */ void setIronBall(daObjCarry_c*);
-    /* 80B9FF08 */ void getEvent(u8);
+    /* 80B9FF08 */ int getEvent(u8);
     /* 80B9FF1C */ void loadAngle();
     /* 80B9FFAC */ void saveAngle();
     /* 80BA0060 */ void setNextAngle();
     /* 80BA0084 */ void setMtx();
     /* 80BA0208 */ void rotateCheck();
     /* 80BA045C */ void shotCheck();
-    /* 80BA0964 */ void eventStart();
-    /* 80BA0974 */ void CreateHeap();
-    /* 80BA09E4 */ void Create();
-    /* 80BA0A94 */ void Execute(f32 (**)[3][4]);
-    /* 80BA0B4C */ void Draw();
-    /* 80BA0C1C */ void Delete();
-    /* 80BA0FA4 */ ~daObjYtaihou_c();
+    /* 80BA0964 */ virtual BOOL eventStart();
+    /* 80BA0974 */ int CreateHeap();
+    /* 80BA09E4 */ int Create();
+    /* 80BA0A94 */ int Execute(Mtx** i_mtx);
+    /* 80BA0B4C */ int Draw();
+    /* 80BA0C1C */ int Delete();
+    /* 80BA0FA4 */ ~daObjYtaihou_c() {}
+
+    void setAddAngle(s8 add_angle) { mAddAngle = add_angle; }
+    s32 getIronBallId() { return mIronBallId; }
+    void startBomb() { mStartBomb = 0xffff; }
 
 private:
-    /* 0x568 */ u8 field_0x568[0x778 - 0x568];
+    /* 0x5b8 */ Mtx mMtx;
+    /* 0x5e8 */ J3DModel* mpModel;
+    /* 0x5ec */ dCcD_Stts mStts;
+    /* 0x628 */ dCcD_Cyl mCyl;
+    /* 0x764 */ s32 mIronBallId;
+    /* 0x768 */ u32 mParticleKeys[2];
+    /* 0x770 */ s16 mStartBomb;
+    /* 0x772 */ s16 field_0x772;
+    /* 0x774 */ s8 field_0x774;
+    /* 0x775 */ u8 field_0x775;
+    /* 0x776 */ s8 mAddAngle;
+    /* 0x777 */ s8 mOldAddAngle;
 };
 
 STATIC_ASSERT(sizeof(daObjYtaihou_c) == 0x778);

include/d/actor/d_a_obj_carry.h

@@ -274,9 +274,18 @@ public:
     void startCtrl() { mCtrl = 1; }
     void endCtrl() { mCtrl = 0; }
     void setDrop() { field_0xcf2 = 3; }
-
+    void offDraw() { mDraw = 1; }
+    void onDraw() { mDraw = 0; }
     bool isDraw() { return mDraw == false; }
 
+    void setPower(fopAc_ac_c* cannon_actor, f32 my_0xde0, f32 my_0xde4, s16 my_0xde8) {
+        mpCannonActor = cannon_actor;
+        field_0xde0 = my_0xde0;
+        field_0xde4 = my_0xde4;
+        field_0xde8 = my_0xde8;
+        field_0xdea = 1;
+    }
+
     static void make_prm(csXyz* param_1, u8 param_2, u8 param_3, u8 param_4, u8 param_5,
                          u8 param_6 = 0) {
         param_1->x = (param_4 << 8) | param_3;

include/d/actor/d_a_player.h

@@ -1026,6 +1026,7 @@ public:
     void onForceGameOver() { onNoResetFlg2(FLG2_FORCE_GAMEOVER); }
     void onForceWolfChange() { onEndResetFlg0(ERFLG0_UNK_2); }
     void onDoPutEmphasys() { onEndResetFlg1(ERFLG1_UNK_10000000); }
+    void onDoExchangePutIn() { onEndResetFlg1(ERFLG1_UNK_4000000); }
     void onNsScream() { onEndResetFlg1(ERFLG1_UNK_1); }
     void onNsScreamAnm() { onEndResetFlg1(daPy_ERFLG1(ERFLG1_UNK_1 | ERFLG1_UNK_2)); }
     void onNeckSearchWide() { onEndResetFlg0(ERFLG0_UNK_400); }

include/d/d_bg_w_base.h

@@ -29,6 +29,7 @@ public:
         PPLABEL_NONE = 0,
         PPLABEL_PUSH = 1,
         PPLABEL_PULL = 2,
+        PPLABEL_3 = 3,
         PPLABEL_4 = 4,
         PPLABEL_HEAVY = 8,
     };