Skip to content

A little work on daObjMasterSword_c #2316

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TakaRikka merged 1 commit into from
Mar 8, 2025
Merged

A little work on daObjMasterSword_c #2316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions config/GZ2E01/rels/d_a_obj_master_sword/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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 changes: 7 additions & 4 deletions include/d/actor/d_a_obj_master_sword.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -38,14 +42,13 @@ class daObjMasterSword_c : public fopAc_ac_c {
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;
Expand Down
Loading