falso
/
tp
mirror of https://github.com/zeldaret/tp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

A little work on daObjMasterSword_c (#2316)

This commit is contained in:
hatal175 2025-03-08 02:01:15 +02:00 committed by GitHub
parent 0f141c2a9c
commit 0d3b4bf9de
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 64 additions and 409 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
config/GZ2E01/rels/d_a_obj_master_sword/symbols.txt
View File

@ -5,7 +5,7 @@ initWait__18daObjMasterSword_cFv = .text:0x00000078; // type:function size:0x58
executeWait__18daObjMasterSword_cFv = .text:0x000000D0; // type:function size:0x100 scope:global
createHeapCallBack__18daObjMasterSword_cFP10fopAc_ac_c = .text:0x000001D0; // type:function size:0x20 scope:global
CreateHeap__18daObjMasterSword_cFv = .text:0x000001F0; // type:function size:0x128 scope:global
daObjMasterSword_Create__FP10fopAc_ac_c = .text:0x00000318; // type:function size:0x20 scope:global
daObjMasterSword_Create__FP10fopAc_ac_c = .text:0x00000318; // type:function size:0x20 scope:local
create__18daObjMasterSword_cFv = .text:0x00000338; // type:function size:0x1B4 scope:global
create_init__18daObjMasterSword_cFv = .text:0x000004EC; // type:function size:0x2A0 scope:global
__dt__12dBgS_ObjAcchFv = .text:0x0000078C; // type:function size:0x70 scope:global
@ -14,12 +14,12 @@ __dt__8cM3dGCylFv = .text:0x0000086C; // type:function size:0x48 scope:global
__dt__8cM3dGAabFv = .text:0x000008B4; // type:function size:0x48 scope:global
__dt__10dCcD_GSttsFv = .text:0x000008FC; // type:function size:0x5C scope:global
__dt__12J3DFrameCtrlFv = .text:0x00000958; // type:function size:0x48 scope:global
daObjMasterSword_Delete__FP18daObjMasterSword_c = .text:0x000009A0; // type:function size:0x28 scope:global
daObjMasterSword_Delete__FP18daObjMasterSword_c = .text:0x000009A0; // type:function size:0x28 scope:local
__dt__18daObjMasterSword_cFv = .text:0x000009C8; // type:function size:0x1A0 scope:global
daObjMasterSword_Execute__FP18daObjMasterSword_c = .text:0x00000B68; // type:function size:0x10C scope:global
daObjMasterSword_Draw__FP18daObjMasterSword_c = .text:0x00000C74; // type:function size:0x20 scope:global
daObjMasterSword_Execute__FP18daObjMasterSword_c = .text:0x00000B68; // type:function size:0x10C scope:local
daObjMasterSword_Draw__FP18daObjMasterSword_c = .text:0x00000C74; // type:function size:0x20 scope:local
draw__18daObjMasterSword_cFv = .text:0x00000C94; // type:function size:0x180 scope:global
daObjMasterSword_IsDelete__FP18daObjMasterSword_c = .text:0x00000E14; // type:function size:0x8 scope:global
daObjMasterSword_IsDelete__FP18daObjMasterSword_c = .text:0x00000E14; // type:function size:0x8 scope:local
__dt__10cCcD_GSttsFv = .text:0x00000E1C; // type:function size:0x48 scope:global
__sinit_d_a_obj_master_sword_cpp = .text:0x00000E64; // type:function size:0x40 scope:local
@36@__dt__12dBgS_ObjAcchFv = .text:0x00000EA4; // type:function size:0x8 scope:local
@ -38,14 +38,14 @@ mAttr__18daObjMasterSword_c = .rodata:0x00000000; // type:object size:0x4 scope:
@4092 = .rodata:0x0000002C; // type:object size:0x4 scope:local
@stringBase0 = .rodata:0x00000030; // type:object size:0xA scope:local data:string_table
...data.0 = .data:0x00000000; // type:label scope:local
cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global
cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local
@1787 = .data:0x0000000C; // type:object size:0x4 scope:local
l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte
l_arcName = .data:0x00000020; // type:object size:0x4 scope:local data:4byte
@3655 = .data:0x00000024; // type:object size:0xC scope:local
@3656 = .data:0x00000030; // type:object size:0xC scope:local
ActionTable__18daObjMasterSword_c = .data:0x0000003C; // type:object size:0x18 scope:global data:4byte
ccCylSrc$localstatic3$initCollision__18daObjMasterSword_cFv = .data:0x00000054; // type:object size:0x44 scope:local data:float
l_daObjMasterSword_Method = .data:0x00000098; // type:object size:0x20 scope:global
l_daObjMasterSword_Method = .data:0x00000098; // type:object size:0x20 scope:local
g_profile_Obj_MasterSword = .data:0x000000B8; // type:object size:0x30 scope:global
__vt__10cCcD_GStts = .data:0x000000E8; // type:object size:0xC scope:global
__vt__10dCcD_GStts = .data:0x000000F4; // type:object size:0xC scope:global
@ -54,4 +54,4 @@ __vt__12dBgS_ObjAcch = .data:0x0000010C; // type:object size:0x24 scope:global
__vt__8cM3dGCyl = .data:0x00000130; // type:object size:0xC scope:global
__vt__8cM3dGAab = .data:0x0000013C; // type:object size:0xC scope:global
__vt__12J3DFrameCtrl = .data:0x00000148; // type:object size:0xC scope:global
lbl_568_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte
lbl_568_bss_0 = .bss:0x00000000; // type:object size:0x1 scope:local data:byte

11
include/d/actor/d_a_obj_master_sword.h
View File

@ -7,6 +7,10 @@
class daObjMasterSword_c;
typedef void (daObjMasterSword_c::*actionFunc)();
struct daObjMasterSword_Attr_c {
f32 field_0x0;
};
/**
* @ingroup actors-objects
* @class daObjMasterSword_c
@ -38,14 +42,13 @@ public:
inline void callExecute();
inline int execute();
f32 attr() const { return mAttr; }
f32 attr() const { return mAttr.field_0x0; }
u8 getEventID() { return (fopAcM_GetParam(this) >> 0x10) & 0xFF; }
u16 getFlagNo() { return fopAcM_GetParam(this) & 0xFFFF; }
static f32 const mAttr;
// static actionFunc ActionTable[];
static u8 ActionTable[24];
static daObjMasterSword_Attr_c const mAttr;
static actionFunc ActionTable[];
private:
/* 0x568 */ J3DModel* mpModel;

444
src/d/actor/d_a_obj_master_sword.cpp
View File

@ -7,117 +7,23 @@
#include "d/actor/d_a_player.h"
#include "d/d_com_inf_game.h"
#include "d/d_meter2_info.h"
#include "dol2asm.h"
// NONMATCHING - vtable order. I think it has something to do with the inline functions.
//
// Forward References:
//
/* 80C91940-80C91944 000000 0004+00 2/2 0/0 0/0 .rodata mAttr__18daObjMasterSword_c */
daObjMasterSword_Attr_c const daObjMasterSword_c::mAttr = {1.0f};
extern "C" void initWait__18daObjMasterSword_cFv();
extern "C" void executeWait__18daObjMasterSword_cFv();
extern "C" void createHeapCallBack__18daObjMasterSword_cFP10fopAc_ac_c();
extern "C" void CreateHeap__18daObjMasterSword_cFv();
extern "C" static void daObjMasterSword_Create__FP10fopAc_ac_c();
extern "C" void create__18daObjMasterSword_cFv();
extern "C" void create_init__18daObjMasterSword_cFv();
extern "C" void __dt__12dBgS_ObjAcchFv();
extern "C" void __dt__12dBgS_AcchCirFv();
extern "C" void __dt__8cM3dGCylFv();
extern "C" void __dt__8cM3dGAabFv();
extern "C" void __dt__10dCcD_GSttsFv();
extern "C" void __dt__12J3DFrameCtrlFv();
extern "C" static void daObjMasterSword_Delete__FP18daObjMasterSword_c();
extern "C" void __dt__18daObjMasterSword_cFv();
extern "C" static void daObjMasterSword_Execute__FP18daObjMasterSword_c();
extern "C" static void daObjMasterSword_Draw__FP18daObjMasterSword_c();
extern "C" void draw__18daObjMasterSword_cFv();
extern "C" static bool daObjMasterSword_IsDelete__FP18daObjMasterSword_c();
extern "C" void __dt__10cCcD_GSttsFv();
extern "C" void __sinit_d_a_obj_master_sword_cpp();
extern "C" static void func_80C91924();
extern "C" static void func_80C9192C();
extern "C" f32 const mAttr__18daObjMasterSword_c;
extern "C" extern char const* const d_a_obj_master_sword__stringBase0;
extern "C" u8 ActionTable__18daObjMasterSword_c[24];
void daObjMasterSword_c::initBaseMtx() {
fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
//
// External References:
//
Vec scale = {attr(), attr(), attr()};
mpModel->setBaseScale(scale);
extern "C" void mDoMtx_YrotM__FPA4_fs();
extern "C" void transS__14mDoMtx_stack_cFRC4cXyz();
extern "C" void play__14mDoExt_baseAnmFv();
extern "C" void init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss();
extern "C" void entry__13mDoExt_btkAnmFP16J3DMaterialTablef();
extern "C" void init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss();
extern "C" void entry__13mDoExt_brkAnmFP16J3DMaterialTablef();
extern "C" void mDoExt_modelUpdateDL__FP8J3DModel();
extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl();
extern "C" void __ct__10fopAc_ac_cFv();
extern "C" void __dt__10fopAc_ac_cFv();
extern "C" void fopAcM_delete__FP10fopAc_ac_c();
extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl();
extern "C" void fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData();
extern "C" void fopAcM_orderMapToolEvent__FP10fopAc_ac_cUcsUsUsUs();
extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc();
extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc();
extern "C" void
dComIfGd_setShadow__FUlScP8J3DModelP4cXyzffffR13cBgS_PolyInfoP12dKy_tevstr_csfP9_GXTexObj();
extern "C" void dComIfGs_setSelectEquipSword__FUc();
extern "C" void onFirstBit__21dSv_player_get_item_cFUc();
extern "C" void onEventBit__11dSv_event_cFUs();
extern "C" void isEventBit__11dSv_event_cCFUs();
extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci();
extern "C" void getActionBtnB__12dAttention_cFv();
extern "C" void ActionTarget__12dAttention_cFl();
extern "C" void __ct__12dBgS_AcchCirFv();
extern "C" void SetWall__12dBgS_AcchCirFff();
extern "C" void __dt__9dBgS_AcchFv();
extern "C" void __ct__9dBgS_AcchFv();
extern "C" void Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz();
extern "C" void CrrPos__9dBgS_AcchFR4dBgS();
extern "C" void SetObj__16dBgS_PolyPassChkFv();
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 Set__8dCcD_CylFRC11dCcD_SrcCyl();
extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c();
extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c();
extern "C" void dMeter2Info_setCloth__FUcb();
extern "C" void dMeter2Info_setSword__FUcb();
extern "C" void Set__4cCcSFP8cCcD_Obj();
extern "C" void __ct__13cBgS_PolyInfoFv();
extern "C" void __dt__13cBgS_PolyInfoFv();
extern "C" void __dt__8cM3dGCirFv();
extern "C" void __dl__FPv();
extern "C" void init__12J3DFrameCtrlFs();
extern "C" void removeTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey();
extern "C" void removeTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey();
extern "C" void __ptmf_scall();
extern "C" void _savegpr_26();
extern "C" void _savegpr_27();
extern "C" void _savegpr_28();
extern "C" void _savegpr_29();
extern "C" void _restgpr_26();
extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */];
extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* 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 mSimpleTexObj__21dDlst_shadowControl_c[32];
extern "C" extern u8 data_80C91AD0[4];
mDoMtx_stack_c::transS(current.pos);
mDoMtx_stack_c::YrotM(shape_angle.y);
//
// Declarations:
//
mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
}
/* 80C90AF8-80C90B50 000078 0058+00 1/0 0/0 0/0 .text initWait__18daObjMasterSword_cFv */
void daObjMasterSword_c::initWait() {
@ -154,50 +60,10 @@ int daObjMasterSword_c::createHeapCallBack(fopAc_ac_c* i_this) {
return static_cast<daObjMasterSword_c*>(i_this)->CreateHeap();
}
/* ############################################################################################## */
/* 80C91940-80C91944 000000 0004+00 2/2 0/0 0/0 .rodata mAttr__18daObjMasterSword_c */
SECTION_RODATA f32 const daObjMasterSword_c::mAttr = 1.0f;
COMPILER_STRIP_GATE(0x80C91940, &daObjMasterSword_c::mAttr);
/* 80C91944-80C91950 000004 000C+00 0/1 0/0 0/0 .rodata @3710 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_3710[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x80C91944, &lit_3710);
#pragma pop
/* 80C91950-80C91954 000010 0004+00 1/2 0/0 0/0 .rodata @3759 */
SECTION_RODATA static f32 const lit_3759 = 1.0f;
COMPILER_STRIP_GATE(0x80C91950, &lit_3759);
/* 80C91970-80C91970 000030 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80C91970 = "MstrSword";
#pragma pop
/* 80C9197C-80C91988 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */
SECTION_DATA static u8 cNullVec__6Z2Calc[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
/* 80C91988-80C9199C 00000C 0004+10 0/0 0/0 0/0 .data @1787 */
#pragma push
#pragma force_active on
SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = {
0x02000201,
/* padding */
0x40080000,
0x00000000,
0x3FE00000,
0x00000000,
};
#pragma pop
UNK_REL_DATA
/* 80C9199C-80C919A0 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */
SECTION_DATA static char* l_arcName = "MstrSword";
static char* l_arcName = "MstrSword";
/* 80C90C70-80C90D98 0001F0 0128+00 1/1 0/0 0/0 .text CreateHeap__18daObjMasterSword_cFv
*/
@ -226,128 +92,8 @@ static int daObjMasterSword_Create(fopAc_ac_c* i_this) {
return static_cast<daObjMasterSword_c*>(i_this)->create();
}
/* ############################################################################################## */
/* 80C919A0-80C919AC -00001 000C+00 0/1 0/0 0/0 .data @3655 */
#pragma push
#pragma force_active on
SECTION_DATA static void* lit_3655[3] = {
(void*)NULL,
(void*)0xFFFFFFFF,
(void*)initWait__18daObjMasterSword_cFv,
};
#pragma pop
/* 80C919AC-80C919B8 -00001 000C+00 0/1 0/0 0/0 .data @3656 */
#pragma push
#pragma force_active on
SECTION_DATA static void* lit_3656[3] = {
(void*)NULL,
(void*)0xFFFFFFFF,
(void*)executeWait__18daObjMasterSword_cFv,
};
#pragma pop
/* 80C919B8-80C919D0 00003C 0018+00 1/2 0/0 0/0 .data ActionTable__18daObjMasterSword_c
*/
SECTION_DATA u8 daObjMasterSword_c::ActionTable[24] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
/* static actionFunc daObjMasterSword_c::ActionTable[] = {
actionFunc daObjMasterSword_c::ActionTable[] = {
&daObjMasterSword_c::initWait, &daObjMasterSword_c::executeWait,
}; */
/* 80C919D0-80C91A14 000054 0044+00 1/1 0/0 0/0 .data
* ccCylSrc$localstatic3$initCollision__18daObjMasterSword_cFv */
SECTION_DATA static u8 data_80C919D0[68] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x79,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x41, 0x90, 0x00, 0x00, 0x43, 0x34, 0x00, 0x00,
};
/* 80C91A14-80C91A34 -00001 0020+00 1/0 0/0 0/0 .data l_daObjMasterSword_Method */
static actor_method_class l_daObjMasterSword_Method = {
(process_method_func)daObjMasterSword_Create__FP10fopAc_ac_c,
(process_method_func)daObjMasterSword_Delete__FP18daObjMasterSword_c,
(process_method_func)daObjMasterSword_Execute__FP18daObjMasterSword_c,
(process_method_func)daObjMasterSword_IsDelete__FP18daObjMasterSword_c,
(process_method_func)daObjMasterSword_Draw__FP18daObjMasterSword_c,
};
/* 80C91A34-80C91A64 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_MasterSword */
extern actor_process_profile_definition g_profile_Obj_MasterSword = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_Obj_MasterSword, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daObjMasterSword_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
562, // mPriority
&l_daObjMasterSword_Method, // sub_method
0x00040000, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
};
/* 80C91A64-80C91A70 0000E8 000C+00 3/3 0/0 0/0 .data __vt__10cCcD_GStts */
SECTION_DATA extern void* __vt__10cCcD_GStts[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__10cCcD_GSttsFv,
};
/* 80C91A70-80C91A7C 0000F4 000C+00 2/2 0/0 0/0 .data __vt__10dCcD_GStts */
SECTION_DATA extern void* __vt__10dCcD_GStts[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__10dCcD_GSttsFv,
};
/* 80C91A7C-80C91A88 000100 000C+00 2/2 0/0 0/0 .data __vt__12dBgS_AcchCir */
SECTION_DATA extern void* __vt__12dBgS_AcchCir[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__12dBgS_AcchCirFv,
};
/* 80C91A88-80C91AAC 00010C 0024+00 2/2 0/0 0/0 .data __vt__12dBgS_ObjAcch */
SECTION_DATA extern void* __vt__12dBgS_ObjAcch[9] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__12dBgS_ObjAcchFv,
(void*)NULL,
(void*)NULL,
(void*)func_80C9192C,
(void*)NULL,
(void*)NULL,
(void*)func_80C91924,
};
/* 80C91AAC-80C91AB8 000130 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGCyl */
SECTION_DATA extern void* __vt__8cM3dGCyl[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__8cM3dGCylFv,
};
/* 80C91AB8-80C91AC4 00013C 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGAab */
SECTION_DATA extern void* __vt__8cM3dGAab[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__8cM3dGAabFv,
};
/* 80C91AC4-80C91AD0 000148 000C+00 3/3 0/0 0/0 .data __vt__12J3DFrameCtrl */
SECTION_DATA extern void* __vt__12J3DFrameCtrl[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__12J3DFrameCtrlFv,
};
/* 80C90DB8-80C90F6C 000338 01B4+00 1/1 0/0 0/0 .text create__18daObjMasterSword_cFv */
@ -370,28 +116,15 @@ int daObjMasterSword_c::create() {
return phase;
}
void daObjMasterSword_c::callInit() {
(this->**mActionFunc)();
}
/* ############################################################################################## */
/* 80C91954-80C91958 000014 0004+00 0/1 0/0 0/0 .rodata @3861 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3861 = 100.0f;
COMPILER_STRIP_GATE(0x80C91954, &lit_3861);
#pragma pop
/* 80C91958-80C9195C 000018 0004+00 0/2 0/0 0/0 .rodata @3862 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3862 = 10.0f;
COMPILER_STRIP_GATE(0x80C91958, &lit_3862);
#pragma pop
/* 80C9195C-80C91960 00001C 0004+00 0/1 0/0 0/0 .rodata @3863 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3863 = 30.0f;
COMPILER_STRIP_GATE(0x80C9195C, &lit_3863);
#pragma pop
void daObjMasterSword_c::setAction(daObjMasterSword_c::Mode_e i_mode) {
mMode = i_mode;
mActionFunc = &ActionTable[2 * mMode];
callInit();
}
void daObjMasterSword_c::initCollision() {
static dCcD_SrcCyl ccCylSrc = {
@ -413,31 +146,8 @@ void daObjMasterSword_c::initCollision() {
mCyl.SetStts(&mCcStts);
}
void daObjMasterSword_c::initBaseMtx() {
fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
Vec scale = {attr(), attr(), attr()};
mpModel->setBaseScale(scale);
mDoMtx_stack_c::transS(current.pos);
mDoMtx_stack_c::YrotM(shape_angle.y);
mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
}
void daObjMasterSword_c::callInit() {
(this->**mActionFunc)();
}
void daObjMasterSword_c::setAction(daObjMasterSword_c::Mode_e i_mode) {
mMode = i_mode;
// mActionFunc = &ActionTable[mMode];
callInit();
}
/* 80C90F6C-80C9120C 0004EC 02A0+00 1/1 0/0 0/0 .text create_init__18daObjMasterSword_cFv
*/
// NONMATCHING - matches, but weak function emission is hella weird. cant be linked til its fixed
void daObjMasterSword_c::create_init() {
fopAcM_setCullSizeBox2(this, mpModel->getModelData());
initCollision();
@ -445,7 +155,7 @@ void daObjMasterSword_c::create_init() {
fopAcM_OnCarryType(this, fopAcM_CARRY_UNK_30);
cLib_onBit<u32>(attention_info.flags, 0x10);
attention_info.distances[fopAc_attn_SPEAK_e] = 74;
attention_info.distances[fopAc_attn_CARRY_e] = 74;
attention_info.position = current.pos;
attention_info.position.y += 100.0f;
eyePos = attention_info.position;
@ -464,42 +174,6 @@ void daObjMasterSword_c::create_init() {
setAction(MODE_0_e);
}
/* 80C9120C-80C9127C 00078C 0070+00 3/2 0/0 0/0 .text __dt__12dBgS_ObjAcchFv */
// dBgS_ObjAcch::~dBgS_ObjAcch() {
extern "C" void __dt__12dBgS_ObjAcchFv() {
// NONMATCHING
}
/* 80C9127C-80C912EC 0007FC 0070+00 1/0 0/0 0/0 .text __dt__12dBgS_AcchCirFv */
// dBgS_AcchCir::~dBgS_AcchCir() {
extern "C" void __dt__12dBgS_AcchCirFv() {
// NONMATCHING
}
/* 80C912EC-80C91334 00086C 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGCylFv */
// cM3dGCyl::~cM3dGCyl() {
extern "C" void __dt__8cM3dGCylFv() {
// NONMATCHING
}
/* 80C91334-80C9137C 0008B4 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */
// cM3dGAab::~cM3dGAab() {
extern "C" void __dt__8cM3dGAabFv() {
// NONMATCHING
}
/* 80C9137C-80C913D8 0008FC 005C+00 1/0 0/0 0/0 .text __dt__10dCcD_GSttsFv */
// dCcD_GStts::~dCcD_GStts() {
extern "C" void __dt__10dCcD_GSttsFv() {
// NONMATCHING
}
/* 80C913D8-80C91420 000958 0048+00 1/0 0/0 0/0 .text __dt__12J3DFrameCtrlFv */
// J3DFrameCtrl::~J3DFrameCtrl() {
extern "C" void __dt__12J3DFrameCtrlFv() {
// NONMATCHING
}
/* 80C91420-80C91448 0009A0 0028+00 1/0 0/0 0/0 .text
* daObjMasterSword_Delete__FP18daObjMasterSword_c */
static int daObjMasterSword_Delete(daObjMasterSword_c* i_this) {
@ -508,18 +182,10 @@ static int daObjMasterSword_Delete(daObjMasterSword_c* i_this) {
}
/* 80C91448-80C915E8 0009C8 01A0+00 1/1 0/0 0/0 .text __dt__18daObjMasterSword_cFv */
// NONMATCHING - vtables issues
daObjMasterSword_c::~daObjMasterSword_c() {
dComIfG_resDelete(&mPhase, l_arcName);
}
/* ############################################################################################## */
/* 80C91960-80C91968 000020 0008+00 1/1 0/0 0/0 .rodata @4030 */
SECTION_RODATA static u8 const lit_4030[8] = {
0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x80C91960, &lit_4030);
void daObjMasterSword_c::callExecute() {
(this->*mActionFunc[1])();
}
@ -560,21 +226,6 @@ static int daObjMasterSword_Draw(daObjMasterSword_c* i_this) {
return i_this->draw();
}
/* ############################################################################################## */
/* 80C91968-80C9196C 000028 0004+00 0/1 0/0 0/0 .rodata @4091 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4091 = 50.0f;
COMPILER_STRIP_GATE(0x80C91968, &lit_4091);
#pragma pop
/* 80C9196C-80C91970 00002C 0004+00 0/1 0/0 0/0 .rodata @4092 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4092 = 200.0f;
COMPILER_STRIP_GATE(0x80C9196C, &lit_4092);
#pragma pop
/* 80C91714-80C91894 000C94 0180+00 1/1 0/0 0/0 .text draw__18daObjMasterSword_cFv */
int daObjMasterSword_c::draw() {
if (dComIfGs_isTmpBit(dSv_event_tmp_flag_c::tempBitLabels[73])) {
@ -602,36 +253,37 @@ int daObjMasterSword_c::draw() {
return 1;
}
/* 80C91894-80C9189C 000E14 0008+00 1/0 0/0 0/0 .text
* daObjMasterSword_IsDelete__FP18daObjMasterSword_c */
static int daObjMasterSword_IsDelete(daObjMasterSword_c* param_0) {
return 1;
}
/* 80C9189C-80C918E4 000E1C 0048+00 1/0 0/0 0/0 .text __dt__10cCcD_GSttsFv */
// cCcD_GStts::~cCcD_GStts() {
extern "C" void __dt__10cCcD_GSttsFv() {
// NONMATCHING
}
/* 80C91A14-80C91A34 -00001 0020+00 1/0 0/0 0/0 .data l_daObjMasterSword_Method */
static actor_method_class l_daObjMasterSword_Method = {
(process_method_func)daObjMasterSword_Create,
(process_method_func)daObjMasterSword_Delete,
(process_method_func)daObjMasterSword_Execute,
(process_method_func)daObjMasterSword_IsDelete,
(process_method_func)daObjMasterSword_Draw,
};
/* 80C918E4-80C91924 000E64 0040+00 0/0 1/0 0/0 .text __sinit_d_a_obj_master_sword_cpp */
void __sinit_d_a_obj_master_sword_cpp(){// NONMATCHING
}
#pragma push
#pragma force_active on
REGISTER_CTORS(0x80C918E4, __sinit_d_a_obj_master_sword_cpp);
#pragma pop
/* 80C91924-80C9192C 000EA4 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */
static void func_80C91924() {
// NONMATCHING
}
/* 80C9192C-80C91934 000EAC 0008+00 1/0 0/0 0/0 .text @20@__dt__12dBgS_ObjAcchFv */
static void func_80C9192C() {
// NONMATCHING
}
/* 80C91A34-80C91A64 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_MasterSword */
extern actor_process_profile_definition g_profile_Obj_MasterSword = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_Obj_MasterSword, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daObjMasterSword_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
562, // mPriority
&l_daObjMasterSword_Method, // sub_method
0x00040000, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
};
/* 80C91970-80C91970 000030 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */