daObjCBlk_c equivalent (#2326)

This commit is contained in:
hatal175
2025-03-12 16:03:14 -07:00
committed by GitHub
parent 15a807bb7b
commit 34c5d8272e
6 changed files with 277 additions and 960 deletions
+1 -1
View File
@@ -1851,7 +1851,7 @@ config.libs = [
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_bubblePilar"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_catdoor"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_cb"),
ActorRel(NonMatching, "d_a_obj_cblock"),
ActorRel(Equivalent, "d_a_obj_cblock"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_cdoor"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_chandelier"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_chest"),
+42 -9
View File
@@ -1,8 +1,12 @@
#ifndef D_A_OBJ_CBLOCK_H
#define D_A_OBJ_CBLOCK_H
#include "d/d_bg_s_movebg_actor.h"
#include "d/d_cc_d.h"
#include "f_op/f_op_actor_mng.h"
class dPath;
/**
* @ingroup actors-objects
* @class daObjCBlk_c
@@ -11,32 +15,61 @@
* @details
*
*/
class daObjCBlk_c : public fopAc_ac_c {
class daObjCBlk_c : public dBgS_MoveBgActor {
public:
typedef void (daObjCBlk_c::*modeFunc)();
struct chain_s {
public:
/* 80BC5E58 */ ~chain_s();
/* 80BC5E94 */ chain_s();
J3DModel* model;
cXyz position;
};
/* 80BC5A0C */ void initBaseMtx();
/* 80BC5A48 */ void setBaseMtx();
/* 80BC5ABC */ void Create();
/* 80BC5CF8 */ void CreateHeap();
/* 80BC5E98 */ void create();
/* 80BC6260 */ void Execute(f32 (**)[3][4]);
/* 80BC5ABC */ int Create();
/* 80BC5CF8 */ int CreateHeap();
/* 80BC5E98 */ int create();
/* 80BC6260 */ int Execute(f32 (**)[3][4]);
/* 80BC6270 */ void initWait();
/* 80BC627C */ void modeWait();
/* 80BC6414 */ void initWalk();
/* 80BC6430 */ void modeWalk();
/* 80BC65CC */ void getChainBasePos(cXyz*);
/* 80BC6648 */ void setPower(f32);
/* 80BC66DC */ void checkWall();
/* 80BC6868 */ bool Draw();
/* 80BC6870 */ void Delete();
/* 80BC66DC */ BOOL checkWall();
/* 80BC6868 */ int Draw();
/* 80BC6870 */ int Delete();
u8 getArg0() { return fopAcM_GetParamBit(this, 0, 4); }
u8 getSwNo() { return fopAcM_GetParamBit(this, 16, 8); }
u8 getPathID() { return fopAcM_GetParamBit(this, 24, 8); }
private:
/* 0x568 */ u8 field_0x568[0xca8 - 0x568];
/* 0x5A0 */ request_of_phase_process_class phase;
/* 0x5A8 */ J3DModel* model1;
/* 0x5AC */ J3DModel* model2;
/* 0x5B0 */ dCcD_Stts stts;
/* 0x5EC */ dCcD_Cyl cyl;
/* 0x728 */ dCcD_Cyl cyls[4];
/* 0xC18 */ chain_s* chains;
/* 0xC1C */ u8 field_0xc1c;
/* 0xC1D */ u8 field_0xc1d;
/* 0xC1E */ u8 field_0xc1e;
/* 0xC1F */ u8 field_0xc1f;
/* 0xC20 */ f32 power;
/* 0xC24 */ cXyz field_0xc24[7];
/* 0xC78 */ u8 field_0xc78[0xc9c - 0xc78];
/* 0xC9C */ dPath* roomPath;
/* 0xCA0 */ u8 swNo;
/* 0xCA1 */ u8 arg0;
/* 0xCA2 */ u8 field_0xca2;
/* 0xCA3 */ u8 field_0xca3;
/* 0xCA4 */ s16 walkTimer;
/* 0xCA6 */ s16 field_0xca6;
};
STATIC_ASSERT(sizeof(daObjCBlk_c) == 0xca8);
+1 -4
View File
@@ -8,10 +8,7 @@
UNK_REL_DATA;
#include "f_op/f_op_actor_enemy.h"
//
// Declarations:
//
// NONMATCHING - weak function order
/* 806F7EEC-806F7F24 0000EC 0038+00 1/1 0/0 0/0 .text __ct__12daE_KG_HIO_cFv */
daE_KG_HIO_c::daE_KG_HIO_c() {
+8 -307
View File
@@ -10,136 +10,7 @@
#include "d/d_cc_uty.h"
#include "d/actor/d_a_player.h"
#include "d/d_path.h"
#include "dol2asm.h"
//
// Forward References:
//
extern "C" static void ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c();
extern "C" void __dt__4cXyzFv();
extern "C" static void daObj_Brg_Draw__FP13obj_brg_class();
extern "C" static void control1__FP13obj_brg_classP4br_s();
extern "C" static void control2__FP13obj_brg_classP4br_s();
extern "C" static void control3__FP13obj_brg_classP4br_s();
extern "C" static void cut_control1__FP13obj_brg_classP4br_s();
extern "C" static void cut_control2__FP13obj_brg_classP4br_s();
extern "C" static void himo_cut_control1__FP13obj_brg_classP4cXyzf();
extern "C" static void obj_brg_move__FP13obj_brg_class();
extern "C" static void daObj_Brg_Execute__FP13obj_brg_class();
extern "C" static void daObj_Brg_IsDelete__FP13obj_brg_class();
extern "C" static void daObj_Brg_Delete__FP13obj_brg_class();
extern "C" static void CreateInit__FP10fopAc_ac_c();
extern "C" static void CallbackCreateHeap__FP10fopAc_ac_c();
extern "C" static void daObj_Brg_Create__FP10fopAc_ac_c();
extern "C" void __dt__8dCcD_CylFv();
extern "C" void __ct__8dCcD_CylFv();
extern "C" void __dt__8cM3dGCylFv();
extern "C" void __dt__8cM3dGAabFv();
extern "C" void __dt__4br_sFv();
extern "C" void __ct__4br_sFv();
extern "C" void __ct__11J3DLightObjFv();
extern "C" void __ct__4cXyzFv();
extern "C" extern char const* const d_a_obj_brg__stringBase0;
//
// External References:
//
extern "C" void mDoMtx_XrotM__FPA4_fs();
extern "C" void mDoMtx_YrotS__FPA4_fs();
extern "C" void mDoMtx_YrotM__FPA4_fs();
extern "C" void mDoMtx_ZrotM__FPA4_fs();
extern "C" void mDoExt_modelUpdateDL__FP8J3DModel();
extern "C" void init__19mDoExt_3DlineMat1_cFUsUsP7ResTIMGi();
extern "C" void update__19mDoExt_3DlineMat1_cFifR8_GXColorUsP12dKy_tevstr_c();
extern "C" void update__19mDoExt_3DlineMat1_cFiR8_GXColorP12dKy_tevstr_c();
extern "C" void setMat__26mDoExt_3DlineMatSortPacketFP18mDoExt_3DlineMat_c();
extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl();
extern "C" void __ct__10fopAc_ac_cFv();
extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl();
extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc();
extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc();
extern "C" void dComIfGp_getReverb__Fi();
extern "C" void onSwitch__10dSv_info_cFii();
extern "C" void isSwitch__10dSv_info_cCFii();
extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci();
extern "C" void dPath_GetRoomPath__Fii();
extern "C" void dKyw_get_AllWind_vec__FP4cXyzP4cXyzPf();
extern "C" void StartShock__12dVibration_cFii4cXyz();
extern "C" void Release__4cBgSFP9dBgW_Base();
extern "C" void Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c();
extern "C" void __ct__4dBgWFv();
extern "C" void Move__4dBgWFv();
extern "C" void Set__6dBgWSvFP6cBgD_tUl();
extern "C" void CopyBackVtx__6dBgWSvFv();
extern "C" void __ct__10dCcD_GSttsFv();
extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c();
extern "C" void __ct__12dCcD_GObjInfFv();
extern "C" void __dt__12dCcD_GObjInfFv();
extern "C" void ChkTgHit__12dCcD_GObjInfFv();
extern "C" void GetTgHitObj__12dCcD_GObjInfFv();
extern "C" void Set__8dCcD_CylFRC11dCcD_SrcCyl();
extern "C" void at_power_check__FP11dCcU_AtInfo();
extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c();
extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c();
extern "C" void Set__4cCcSFP8cCcD_Obj();
extern "C" void __pl__4cXyzCFRC3Vec();
extern "C" void __mi__4cXyzCFRC3Vec();
extern "C" void __ml__4cXyzCFf();
extern "C" void cM_atan2s__Fff();
extern "C" void cM_rndF__Ff();
extern "C" void SetC__8cM3dGCylFRC4cXyz();
extern "C" void SetH__8cM3dGCylFf();
extern "C" void SetR__8cM3dGCylFf();
extern "C" void cLib_addCalc2__FPffff();
extern "C" void cLib_addCalc0__FPfff();
extern "C" void cLib_addCalcAngleS2__FPssss();
extern "C" void MtxTrans__FfffUc();
extern "C" void MtxScale__FfffUc();
extern "C" void MtxPosition__FP4cXyzP4cXyz();
extern "C" void MtxPush__Fv();
extern "C" void MtxPull__Fv();
extern "C" void func_802807E0();
extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
extern "C" void* __nw__FUl();
extern "C" void __dl__FPv();
extern "C" void __as__12J3DLightInfoFRC12J3DLightInfo();
extern "C" void __destroy_arr();
extern "C" void __construct_array();
extern "C" void __cvt_fp2unsigned();
extern "C" void _savegpr_17();
extern "C" void _savegpr_18();
extern "C" void _savegpr_20();
extern "C" void _savegpr_23();
extern "C" void _savegpr_24();
extern "C" void _savegpr_25();
extern "C" void _savegpr_26();
extern "C" void _savegpr_28();
extern "C" void _restgpr_17();
extern "C" void _restgpr_18();
extern "C" void _restgpr_20();
extern "C" void _restgpr_23();
extern "C" void _restgpr_24();
extern "C" void _restgpr_25();
extern "C" void _restgpr_26();
extern "C" void _restgpr_28();
extern "C" extern void* __vt__19mDoExt_3DlineMat1_c[5];
extern "C" extern void* __vt__6dBgWSv[65 + 1 /* padding */];
extern "C" extern void* __vt__8dCcD_Cyl[36];
extern "C" extern void* __vt__9dCcD_Stts[11];
extern "C" extern void* __vt__12cCcD_CylAttr[25];
extern "C" extern void* __vt__14cCcD_ShapeAttr[22];
extern "C" extern void* __vt__9cCcD_Stts[8];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" u8 sincosTable___5JMath[65536];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" void __register_global_object();
//
// Declarations:
//
#include "Z2AudioLib/Z2Instances.h"
/* 80BBC90C-80BBCCFC 0000EC 03F0+00 1/1 0/0 0/0 .text
* ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c */
@@ -858,7 +729,7 @@ static void himo_cut_control1(obj_brg_class* i_this, cXyz* param_1, f32 param_2)
}
/* 80BC23AC-80BC23D8 000008 002C+00 1/1 0/0 0/0 .data ita_z_p */
SECTION_DATA static f32 ita_z_p[] = {
static f32 ita_z_p[] = {
0.1f,
0.3f,
0.5f,
@@ -2157,185 +2028,15 @@ static int daObj_Brg_Create(fopAc_ac_c* i_this) {
return phase_state;
}
/* ############################################################################################## */
/* 80BC273C-80BC2740 00025C 0004+00 0/0 0/0 0/0 .bss
* sInstance__40JASGlobalInstance<19JASDefaultBankTable> */
#pragma push
#pragma force_active on
static u8 data_80BC273C[4];
#pragma pop
/* 80BC2740-80BC2744 000260 0004+00 0/0 0/0 0/0 .bss
* sInstance__35JASGlobalInstance<14JASAudioThread> */
#pragma push
#pragma force_active on
static u8 data_80BC2740[4];
#pragma pop
/* 80BC2744-80BC2748 000264 0004+00 0/0 0/0 0/0 .bss sInstance__27JASGlobalInstance<7Z2SeMgr> */
#pragma push
#pragma force_active on
static u8 data_80BC2744[4];
#pragma pop
/* 80BC2748-80BC274C 000268 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8Z2SeqMgr> */
#pragma push
#pragma force_active on
static u8 data_80BC2748[4];
#pragma pop
/* 80BC274C-80BC2750 00026C 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SceneMgr>
*/
#pragma push
#pragma force_active on
static u8 data_80BC274C[4];
#pragma pop
/* 80BC2750-80BC2754 000270 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2StatusMgr>
*/
#pragma push
#pragma force_active on
static u8 data_80BC2750[4];
#pragma pop
/* 80BC2754-80BC2758 000274 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2DebugSys>
*/
#pragma push
#pragma force_active on
static u8 data_80BC2754[4];
#pragma pop
/* 80BC2758-80BC275C 000278 0004+00 0/0 0/0 0/0 .bss
* sInstance__36JASGlobalInstance<15JAISoundStarter> */
#pragma push
#pragma force_active on
static u8 data_80BC2758[4];
#pragma pop
/* 80BC275C-80BC2760 00027C 0004+00 0/0 0/0 0/0 .bss
* sInstance__35JASGlobalInstance<14Z2SoundStarter> */
#pragma push
#pragma force_active on
static u8 data_80BC275C[4];
#pragma pop
/* 80BC2760-80BC2764 000280 0004+00 0/0 0/0 0/0 .bss
* sInstance__33JASGlobalInstance<12Z2SpeechMgr2> */
#pragma push
#pragma force_active on
static u8 data_80BC2760[4];
#pragma pop
/* 80BC2764-80BC2768 000284 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8JAISeMgr> */
#pragma push
#pragma force_active on
static u8 data_80BC2764[4];
#pragma pop
/* 80BC2768-80BC276C 000288 0004+00 0/0 0/0 0/0 .bss sInstance__29JASGlobalInstance<9JAISeqMgr> */
#pragma push
#pragma force_active on
static u8 data_80BC2768[4];
#pragma pop
/* 80BC276C-80BC2770 00028C 0004+00 0/0 0/0 0/0 .bss
* sInstance__33JASGlobalInstance<12JAIStreamMgr> */
#pragma push
#pragma force_active on
static u8 data_80BC276C[4];
#pragma pop
/* 80BC2770-80BC2774 000290 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SoundMgr>
*/
#pragma push
#pragma force_active on
static u8 data_80BC2770[4];
#pragma pop
/* 80BC2774-80BC2778 000294 0004+00 0/0 0/0 0/0 .bss
* sInstance__33JASGlobalInstance<12JAISoundInfo> */
#pragma push
#pragma force_active on
static u8 data_80BC2774[4];
#pragma pop
/* 80BC2778-80BC277C 000298 0004+00 0/0 0/0 0/0 .bss
* sInstance__34JASGlobalInstance<13JAUSoundTable> */
#pragma push
#pragma force_active on
static u8 data_80BC2778[4];
#pragma pop
/* 80BC277C-80BC2780 00029C 0004+00 0/0 0/0 0/0 .bss
* sInstance__38JASGlobalInstance<17JAUSoundNameTable> */
#pragma push
#pragma force_active on
static u8 data_80BC277C[4];
#pragma pop
/* 80BC2780-80BC2784 0002A0 0004+00 0/0 0/0 0/0 .bss
* sInstance__33JASGlobalInstance<12JAUSoundInfo> */
#pragma push
#pragma force_active on
static u8 data_80BC2780[4];
#pragma pop
/* 80BC2784-80BC2788 0002A4 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SoundInfo>
*/
#pragma push
#pragma force_active on
static u8 data_80BC2784[4];
#pragma pop
/* 80BC2788-80BC278C 0002A8 0004+00 0/0 0/0 0/0 .bss
* sInstance__34JASGlobalInstance<13Z2SoundObjMgr> */
#pragma push
#pragma force_active on
static u8 data_80BC2788[4];
#pragma pop
/* 80BC278C-80BC2790 0002AC 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2Audience>
*/
#pragma push
#pragma force_active on
static u8 data_80BC278C[4];
#pragma pop
/* 80BC2790-80BC2794 0002B0 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2FxLineMgr>
*/
#pragma push
#pragma force_active on
static u8 data_80BC2790[4];
#pragma pop
/* 80BC2794-80BC2798 0002B4 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2EnvSeMgr>
*/
#pragma push
#pragma force_active on
static u8 data_80BC2794[4];
#pragma pop
/* 80BC2798-80BC279C 0002B8 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SpeechMgr>
*/
#pragma push
#pragma force_active on
static u8 data_80BC2798[4];
#pragma pop
/* 80BC279C-80BC27A0 0002BC 0004+00 0/0 0/0 0/0 .bss
* sInstance__34JASGlobalInstance<13Z2WolfHowlMgr> */
#pragma push
#pragma force_active on
static u8 data_80BC279C[4];
#pragma pop
AUDIO_INSTANCES;
/* 80BC2460-80BC2480 -00001 0020+00 1/0 0/0 0/0 .data l_daObj_Brg_Method */
static actor_method_class l_daObj_Brg_Method = {
(process_method_func)daObj_Brg_Create__FP10fopAc_ac_c,
(process_method_func)daObj_Brg_Delete__FP13obj_brg_class,
(process_method_func)daObj_Brg_Execute__FP13obj_brg_class,
(process_method_func)daObj_Brg_IsDelete__FP13obj_brg_class,
(process_method_func)daObj_Brg_Draw__FP13obj_brg_class,
(process_method_func)daObj_Brg_Create,
(process_method_func)daObj_Brg_Delete,
(process_method_func)daObj_Brg_Execute,
(process_method_func)daObj_Brg_IsDelete,
(process_method_func)daObj_Brg_Draw,
};
/* 80BC2480-80BC24B0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_BRG */
File diff suppressed because it is too large Load Diff
+1
View File
@@ -20,6 +20,7 @@ root_dir = os.path.abspath(os.path.join(script_dir, ".."))
src_dir = os.path.join(root_dir, "src")
include_dirs = [
os.path.join(root_dir, "include"),
os.path.join(root_dir, "include/dolphin"),
os.path.join(root_dir, "src"),
os.path.join(root_dir, "src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include"),
os.path.join(root_dir, "src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Include"),