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

daItemShield_c OK (#2283)

This commit is contained in:
hatal175 2025-01-06 11:59:48 +02:00 committed by GitHub
parent 523040331d
commit 0cdacf4bff
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 423 additions and 722 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
config/GZ2E01/rels/d_a_obj_shield/symbols.txt
View File

@ -1,7 +1,7 @@
_prolog = .text:0x00000000; // type:function size:0x2C scope:global
_epilog = .text:0x0000002C; // type:function size:0x2C scope:global
_unresolved = .text:0x00000058; // type:function size:0x20 scope:global
Reflect__FP4cXyzRC13cBgS_PolyInfof = .text:0x00000078; // type:function size:0x2FC scope:global
Reflect__FP4cXyzRC13cBgS_PolyInfof = .text:0x00000078; // type:function size:0x2FC scope:local
__dt__8cM3dGPlaFv = .text:0x00000374; // type:function size:0x48 scope:global
initBaseMtx__14daItemShield_cFv = .text:0x000003BC; // type:function size:0x3C scope:global
setBaseMtx__14daItemShield_cFv = .text:0x000003F8; // type:function size:0x2BC scope:global
@ -29,10 +29,10 @@ actionCamDemoEnd__14daItemShield_cFv = .text:0x00001604; // type:function size:0
execute__14daItemShield_cFv = .text:0x00001608; // type:function size:0x104 scope:global
draw__14daItemShield_cFv = .text:0x0000170C; // type:function size:0x54 scope:global
_delete__14daItemShield_cFv = .text:0x00001760; // type:function size:0x38 scope:global
daItemShield_Draw__FP14daItemShield_c = .text:0x00001798; // type:function size:0x20 scope:global
daItemShield_Execute__FP14daItemShield_c = .text:0x000017B8; // type:function size:0x20 scope:global
daItemShield_Delete__FP14daItemShield_c = .text:0x000017D8; // type:function size:0x20 scope:global
daItemShield_Create__FP10fopAc_ac_c = .text:0x000017F8; // type:function size:0x20 scope:global
daItemShield_Draw__FP14daItemShield_c = .text:0x00001798; // type:function size:0x20 scope:local
daItemShield_Execute__FP14daItemShield_c = .text:0x000017B8; // type:function size:0x20 scope:local
daItemShield_Delete__FP14daItemShield_c = .text:0x000017D8; // type:function size:0x20 scope:local
daItemShield_Create__FP10fopAc_ac_c = .text:0x000017F8; // type:function size:0x20 scope:local
__dt__10cCcD_GSttsFv = .text:0x00001818; // type:function size:0x48 scope:global
cLib_calcTimer<Uc>__FPUc = .text:0x00001860; // type:function size:0x1C scope:global
@36@__dt__12dBgS_ObjAcchFv = .text:0x0000187C; // type:function size:0x8 scope:local
@ -40,7 +40,7 @@ cLib_calcTimer<Uc>__FPUc = .text:0x00001860; // type:function size:0x1C scope:gl
_ctors = .ctors:0x00000000; // type:label scope:global
_dtors = .dtors:0x00000000; // type:label scope:global
...rodata.0 = .rodata:0x00000000; // type:label scope:local
l_cyl_src = .rodata:0x00000000; // type:object size:0x44 scope:global
l_cyl_src = .rodata:0x00000000; // type:object size:0x44 scope:local
@3856 = .rodata:0x00000044; // type:object size:0x4 scope:local
@3857 = .rodata:0x00000048; // type:object size:0x8 scope:local
@3858 = .rodata:0x00000050; // type:object size:0x8 scope:local
@ -65,7 +65,7 @@ l_cyl_src = .rodata:0x00000000; // type:object size:0x44 scope:global
@4337 = .rodata:0x000000B4; // type:object size:0x4 scope:local data:string
@stringBase0 = .rodata:0x000000B8; // type:object size:0x10 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
@4189 = .data:0x00000020; // type:object size:0xC scope:local
@4190 = .data:0x0000002C; // type:object size:0xC scope:local
@ -77,7 +77,7 @@ l_actionFunc$4188 = .data:0x00000050; // type:object size:0x30 scope:local
@4385 = .data:0x00000098; // type:object size:0xC scope:local
@4386 = .data:0x000000A4; // type:object size:0xC scope:local
l_func$4382 = .data:0x000000B0; // type:object size:0x30 scope:local
l_daItemShield_Method = .data:0x000000E0; // type:object size:0x20 scope:global
l_daItemShield_Method = .data:0x000000E0; // type:object size:0x20 scope:local
g_profile_Obj_Shield = .data:0x00000100; // type:object size:0x30 scope:global
__vt__12dBgS_AcchCir = .data:0x00000130; // type:object size:0xC scope:global
__vt__10cCcD_GStts = .data:0x0000013C; // type:object size:0xC scope:global
@ -87,5 +87,5 @@ __vt__8cM3dGAab = .data:0x00000160; // type:object size:0xC scope:global
__vt__12dBgS_ObjAcch = .data:0x0000016C; // type:object size:0x24 scope:global
__vt__14daItemShield_c = .data:0x00000190; // type:object size:0x44 scope:global
__vt__8cM3dGPla = .data:0x000001D4; // type:object size:0xC scope:global
lbl_619_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte
lbl_619_bss_1 = .bss:0x00000001; // type:object size:0x1 data:byte
lbl_619_bss_0 = .bss:0x00000000; // type:object size:0x1 scope:local data:byte
lbl_619_bss_1 = .bss:0x00000001; // type:object size:0x1 scope:local data:byte

2
configure.py
View File

@ -1984,7 +1984,7 @@ config.libs = [
ActorRel(NonMatching, "d_a_obj_sekidoor"),
ActorRel(Matching, "d_a_obj_sekizo"),
ActorRel(NonMatching, "d_a_obj_sekizoa"),
ActorRel(NonMatching, "d_a_obj_shield"),
ActorRel(Matching, "d_a_obj_shield"),
ActorRel(Equivalent, "d_a_obj_sm_door"),
ActorRel(NonMatching, "d_a_obj_smallkey"),
ActorRel(NonMatching, "d_a_obj_smgdoor"),

69
include/d/actor/d_a_obj_shield.h
View File

@ -1,6 +1,7 @@
#ifndef D_A_OBJ_SHIELD_H
#define D_A_OBJ_SHIELD_H
#include "d/actor/d_a_itembase.h"
#include "f_op/f_op_actor_mng.h"
/**
@ -11,32 +12,70 @@
* @details
*
*/
class daItemShield_c : public fopAc_ac_c {
class daItemShield_c : public daItemBase_c {
public:
enum Status {
STATUS_INIT,
STATUS_WAIT,
STATUS_ORDERGETDEMO,
STATUS_GETDEMO,
};
enum Action {
ACTION_WAIT_CAM_DEMO,
ACTION_ORDER_CAM_DEMO,
ACTION_CAM_DEMO,
ACTION_CAM_DEMO_END,
};
typedef int (daItemShield_c::*actionFunc)();
typedef void (daItemShield_c::*camActionFunc)();
/* 80CD6D9C */ void initBaseMtx();
/* 80CD6DD8 */ void setBaseMtx();
/* 80CD7094 */ void Create();
/* 80CD724C */ bool __CreateHeap();
/* 80CD7254 */ void create();
/* 80CD7094 */ int Create();
/* 80CD724C */ virtual int __CreateHeap();
/* 80CD7254 */ int create();
/* 80CD75EC */ void bg_check();
/* 80CD7734 */ void action_proc_call();
/* 80CD77F0 */ void actionInit();
/* 80CD7828 */ void actionWaitInit();
/* 80CD7890 */ void actionWait();
/* 80CD7C68 */ void initActionOrderGetDemo();
/* 80CD7D04 */ void actionOrderGetDemo();
/* 80CD7D80 */ void actionGetDemo();
/* 80CD7734 */ int action_proc_call();
/* 80CD77F0 */ int actionInit();
/* 80CD7828 */ int actionWaitInit();
/* 80CD7890 */ int actionWait();
/* 80CD7C68 */ int initActionOrderGetDemo();
/* 80CD7D04 */ int actionOrderGetDemo();
/* 80CD7D80 */ int actionGetDemo();
/* 80CD7E00 */ void event_proc_call();
/* 80CD7EBC */ void actionWaitCamDemo();
/* 80CD7F20 */ void actionOrderCamDemo();
/* 80CD7F88 */ void actionCamDemo();
/* 80CD7FE4 */ void actionCamDemoEnd();
/* 80CD7FE8 */ void execute();
/* 80CD80EC */ void draw();
/* 80CD8140 */ void _delete();
/* 80CD7FE8 */ int execute();
/* 80CD80EC */ int draw();
/* 80CD8140 */ int _delete();
u8 getSwBit2() { return (fopAcM_GetParam(this) >> 8) & 0xff; }
u8 getSwBit() { return (fopAcM_GetParam(this) >> 16) & 0xff; }
u8 getEvId() { return (fopAcM_GetParam(this) >> 24) & 0xff; }
void setStatus(u8 status) { mStatus = status; }
void setAction(u8 action) { mAction = action; }
private:
/* 0x568 */ u8 field_0x568[0x958 - 0x568];
/* 0x92C */ fpc_ProcID mItemId;
/* 0x930 */ int mRotAngleCoeff;
/* 0x934 */ u8 mStatus;
/* 0x935 */ u8 field_0x935;
/* 0x936 */ u8 field_0x936;
/* 0x937 */ bool field_0x937;
/* 0x938 */ cXyz field_0x938;
/* 0x944 */ csXyz field_0x944;
/* 0x94A */ u8 field_0x94a;
/* 0x94B */ u8 mAction;
/* 0x94C */ u8 field_0x94c;
/* 0x94D */ u8 mEvId;
/* 0x94E */ s16 mEventIdx;
/* 0x950 */ s16 field_0x950;
/* 0x952 */ s16 field_0x952;
/* 0x954 */ s16 field_0x954;
};
STATIC_ASSERT(sizeof(daItemShield_c) == 0x958);

1054
src/d/actor/d_a_obj_shield.cpp
View File

File diff suppressed because it is too large Load Diff