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

d_a_npc_tk equivalent (#2483)

This commit is contained in:
Max Roncace 2025-06-13 09:40:18 -04:00 committed by GitHub
parent 288a08b798
commit 9b50fd55c2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
18 changed files with 3293 additions and 1745 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,7 +8,7 @@ setBck__10daNPC_TK_cFiUcff = .text:0x00000178; // type:function size:0xA4 scope:
checkBck__10daNPC_TK_cFi = .text:0x0000021C; // type:function size:0x5C scope:global
draw__10daNPC_TK_cFv = .text:0x00000278; // type:function size:0xE0 scope:global
__dt__4cXyzFv = .text:0x00000358; // type:function size:0x3C scope:global
daNPC_TK_Draw__FP10daNPC_TK_c = .text:0x00000394; // type:function size:0x20 scope:global
daNPC_TK_Draw__FP10daNPC_TK_c = .text:0x00000394; // type:function size:0x20 scope:local
checkBeforeBg__10daNPC_TK_cFv = .text:0x000003B4; // type:function size:0x1A4 scope:global
setActionMode__10daNPC_TK_cFi = .text:0x00000558; // type:function size:0x7C scope:global
setAddCalcSpeedXZ__10daNPC_TK_cFR4cXyzRC4cXyzfff = .text:0x000005D4; // type:function size:0x390 scope:global
@ -18,8 +18,8 @@ setMasterShoulder__10daNPC_TK_cFP4cXyz = .text:0x00000A80; // type:function size
setAwayAction__10daNPC_TK_cFi = .text:0x00000B28; // type:function size:0xAC scope:global
setFlySE__10daNPC_TK_cFv = .text:0x00000BD4; // type:function size:0x188 scope:global
checkRangeOfTake__FP10fopAc_ac_cP10fopAc_ac_c = .text:0x00000D5C; // type:function size:0x124 scope:global
s_obj_sub__FPvPv = .text:0x00000E80; // type:function size:0x68 scope:global
s_hanjo__FPvPv = .text:0x00000EE8; // type:function size:0x4C scope:global
s_obj_sub__FPvPv = .text:0x00000E80; // type:function size:0x68 scope:local
s_hanjo__FPvPv = .text:0x00000EE8; // type:function size:0x4C scope:local
executeFly__10daNPC_TK_cFv = .text:0x00000F34; // type:function size:0x4A4 scope:global
initPerchDemo__10daNPC_TK_cFi = .text:0x000013D8; // type:function size:0x464 scope:global
executePerchDemo__10daNPC_TK_cFi = .text:0x0000183C; // type:function size:0xAFC scope:global
@ -53,24 +53,24 @@ action__10daNPC_TK_cFv = .text:0x00009F64; // type:function size:0x348 scope:glo
mtx_set__10daNPC_TK_cFv = .text:0x0000A2AC; // type:function size:0x110 scope:global
cc_set__10daNPC_TK_cFv = .text:0x0000A3BC; // type:function size:0xF0 scope:global
execute__10daNPC_TK_cFv = .text:0x0000A4AC; // type:function size:0x124 scope:global
daNPC_TK_Execute__FP10daNPC_TK_c = .text:0x0000A5D0; // type:function size:0x20 scope:global
daNPC_TK_IsDelete__FP10daNPC_TK_c = .text:0x0000A5F0; // type:function size:0x8 scope:global
daNPC_TK_Execute__FP10daNPC_TK_c = .text:0x0000A5D0; // type:function size:0x20 scope:local
daNPC_TK_IsDelete__FP10daNPC_TK_c = .text:0x0000A5F0; // type:function size:0x8 scope:local
_delete__10daNPC_TK_cFv = .text:0x0000A5F8; // type:function size:0x74 scope:global
daNPC_TK_Delete__FP10daNPC_TK_c = .text:0x0000A66C; // type:function size:0x20 scope:global
daNPC_TK_Delete__FP10daNPC_TK_c = .text:0x0000A66C; // type:function size:0x20 scope:local
ctrlJoint__10daNPC_TK_cFP8J3DJointP8J3DModel = .text:0x0000A68C; // type:function size:0x1D0 scope:global
JointCallBack__10daNPC_TK_cFP8J3DJointi = .text:0x0000A85C; // type:function size:0x4C scope:global
CreateHeap__10daNPC_TK_cFv = .text:0x0000A8A8; // type:function size:0x13C scope:global
useHeapInit__FP10fopAc_ac_c = .text:0x0000A9E4; // type:function size:0x20 scope:global
useHeapInit__FP10fopAc_ac_c = .text:0x0000A9E4; // type:function size:0x20 scope:local
create__10daNPC_TK_cFv = .text:0x0000AA04; // type:function size:0x2BC scope:global
__dt__8cM3dGSphFv = .text:0x0000ACC0; // type:function size:0x48 scope:global
__dt__8cM3dGAabFv = .text:0x0000AD08; // type:function size:0x48 scope:global
__dt__12dBgS_ObjAcchFv = .text:0x0000AD50; // type:function size:0x70 scope:global
__ct__4cXyzFv = .text:0x0000ADC0; // type:function size:0x4 scope:global
daNPC_TK_Create__FP10daNPC_TK_c = .text:0x0000ADC4; // type:function size:0x20 scope:global
daNPC_TK_Create__FP10daNPC_TK_c = .text:0x0000ADC4; // type:function size:0x20 scope:local
__dt__14daNPC_TK_HIO_cFv = .text:0x0000ADE4; // type:function size:0x48 scope:global
__sinit_d_a_npc_tk_cpp = .text:0x0000AE2C; // type:function size:0x3C scope:local
@36@__dt__12dBgS_ObjAcchFv = .text:0x0000AE68; // type:function size:0x8 scope:local
@20@__dt__12dBgS_ObjAcchFv = .text:0x0000AE70; // type:function size:0x8 scope:local
@36@__dt__12dBgS_ObjAcchFv = .text:0x0000AE68; // type:function size:0x8 scope:global
@20@__dt__12dBgS_ObjAcchFv = .text:0x0000AE70; // type:function size:0x8 scope:global
checkNowWolf__9daPy_py_cFv = .text:0x0000AE78; // type:function size:0x18 scope:global
_ctors = .ctors:0x00000000; // type:label scope:global
__destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 scope:global

2
configure.py
View File

@ -1833,7 +1833,7 @@ config.libs = [
ActorRel(MatchingFor("GZ2E01"), "d_a_npc_sq"),
ActorRel(NonMatching, "d_a_npc_the"),
ActorRel(NonMatching, "d_a_npc_theB"),
ActorRel(NonMatching, "d_a_npc_tk"),
ActorRel(Equivalent, "d_a_npc_tk"), # weak function order
ActorRel(NonMatching, "d_a_npc_tkc"),
ActorRel(NonMatching, "d_a_npc_tkj2"),
ActorRel(NonMatching, "d_a_npc_tks"),

3
include/d/actor/d_a_b_gg.h
View File

@ -175,10 +175,11 @@ public:
STATIC_ASSERT(sizeof(daB_GG_c) == 0x116c);
class daB_GG_HIO_c {
class daB_GG_HIO_c : public JORReflexible {
public:
/* 805DE40C */ daB_GG_HIO_c();
/* 805EC9C4 */ virtual ~daB_GG_HIO_c() {}
void genMessage(JORMContext*) {}
/* 0x04 */ s8 id;
/* 0x08 */ f32 base_size;

12
include/d/actor/d_a_ni.h
View File

@ -61,6 +61,18 @@ class ni_class : public fopEn_enemy_c {
public:
bool checkGold() { return mColor == COLOR_GOLD; }
void setMtx(MtxP mtx) {
cXyz newPos;
field_0xb08 = 1;
mDoMtx_stack_c::copy(mtx);
mDoMtx_stack_c::multVecZero(&newPos);
current.pos = newPos;
old.pos = current.pos;
speed.y = 0.0f;
speedF = 0.0f;
mpMorf->getModel()->setBaseTRMtx(mtx);
}
/* 0x5AC */ request_of_phase_process_class mPhase;
/* 0x5B4 */ u8 field_0x5b4;
/* 0x5B5 */ u8 mType;

1
include/d/actor/d_a_npc_hanjo.h
View File

@ -165,6 +165,7 @@ public:
/* 80A00514 */ int checkRemoveJoint(int param_1) { return param_1 == 8; }
/* 80A00524 */ s32 getFootLJointNo() { return 22; }
/* 80A0052C */ s32 getFootRJointNo() { return 26; }
MtxP getArmLMtx() { return mpMorf[0]->getModel()->getAnmMtx(11); }
int getFlowNodeNo() {
u16 nodeNo = home.angle.x;

5
include/d/actor/d_a_npc_moir.h
View File

@ -51,10 +51,13 @@ public:
/* 80A82878 */ void drawOtherMdls();
/* 80A82900 */ bool drawDbgInfo();
MtxP getHandRMtx() { return mpMorf->getModel()->getAnmMtx(17); }
static u8 mEvtSeqList[48];
private:
/* 0x568 */ u8 field_0x568[0xe0c - 0x568];
/* 0x568 */ mDoExt_McaMorfSO* mpMorf;
/* 0x56C */ u8 field_0x56c[0xe0c - 0x56c];
};
STATIC_ASSERT(sizeof(daNpcMoiR_c) == 0xe0c);

154
include/d/actor/d_a_npc_tk.h
View File

@ -2,9 +2,11 @@
#define D_A_NPC_TK_H
#include "d/actor/d_a_npc.h"
#include "d/d_cc_uty.h"
#include "d/d_path.h"
struct cXyz;
class daNpc_Hanjo_c;
class fopAc_ac_c;
class J3DJoint;
class J3DModel;
@ -20,33 +22,40 @@ class J3DModel;
class daNPC_TK_c : public fopAc_ac_c {
public:
/* 80B01498 */ void setBck(int, u8, f32, f32);
/* 80B0153C */ void checkBck(int);
/* 80B01598 */ void draw();
/* 80B016D4 */ void checkBeforeBg();
/* 80B0153C */ bool checkBck(int);
/* 80B01598 */ int draw();
/* 80B016D4 */ int checkBeforeBg();
/* 80B01878 */ void setActionMode(int);
/* 80B018F4 */ void setAddCalcSpeedXZ(cXyz&, cXyz const&, f32, f32, f32);
/* 80B01C84 */ void chaseTargetPos(cXyz, f32, f32, s16);
/* 80B01D84 */ void getMasterPointer();
/* 80B018F4 */ f32 setAddCalcSpeedXZ(cXyz&, cXyz const&, f32, f32, f32);
/* 80B01C84 */ cXyz chaseTargetPos(cXyz, f32, f32, s16);
/* 80B01D84 */
fopAc_ac_c* getMasterPointer();
/* 80B01DA0 */ void setMasterShoulder(cXyz*);
/* 80B01E48 */ void setAwayAction(int);
/* 80B01EF4 */ void setFlySE();
/* 80B02254 */ void executeFly();
/* 80B026F8 */ void initPerchDemo(int);
/* 80B02B5C */ void executePerchDemo(int);
/* 80B02B5C */
bool executePerchDemo(int);
/* 80B03658 */ void executePerch();
/* 80B03754 */ void executeHandOn();
/* 80B039A8 */ void checkWaterSurface(f32);
/* 80B039A8 */
bool checkWaterSurface(f32);
/* 80B03A70 */ void executeAttack();
/* 80B048BC */ void executeAway();
/* 80B04BF8 */ void setCarryActorMtx();
/* 80B04F64 */ void getTakePosY();
/* 80B04FA8 */ void getTakeOffPosY();
/* 80B04F64 */
f32 getTakePosY();
/* 80B04FA8 */
f32 getTakeOffPosY();
/* 80B04FEC */ void executeBack();
/* 80B05BD0 */ void getHanjoHandPos();
/* 80B05BD0 */
cXyz getHanjoHandPos();
/* 80B05C7C */ void executeStayHanjo();
/* 80B05EC8 */ void executeAttackLink();
/* 80B0686C */ void executeBackHanjo();
/* 80B07114 */ void checkAttackDemo();
/* 80B07114 */
bool checkAttackDemo();
/* 80B072CC */ void executeAttackDemo();
/* 80B07610 */ void executeBackHanjoDemo();
/* 80B08168 */ void executeWolfEvent();
@ -62,12 +71,13 @@ public:
/* 80B0B284 */ void action();
/* 80B0B5CC */ void mtx_set();
/* 80B0B6DC */ void cc_set();
/* 80B0B7CC */ void execute();
/* 80B0B918 */ void _delete();
/* 80B0B9AC */ void ctrlJoint(J3DJoint*, J3DModel*);
/* 80B0BB7C */ void JointCallBack(J3DJoint*, int);
/* 80B0BBC8 */ void CreateHeap();
/* 80B0BD24 */ void create();
/* 80B0B7CC */ int execute();
/* 80B0B918 */ int _delete();
/* 80B0B9AC */
int ctrlJoint(J3DJoint*, J3DModel*);
/* 80B0BB7C */ static int JointCallBack(J3DJoint*, int);
/* 80B0BBC8 */ int CreateHeap();
/* 80B0BD24 */ int create();
void setBump() { mFlags |= 4; }
void setEventWolf() { mFlags |= 0x80; }
@ -77,7 +87,7 @@ public:
void setHawkPath(u8 i_pathNo) {
if (i_pathNo != 0xFF) {
field_0x6c8 = dPath_GetRoomPath(i_pathNo, fopAcM_GetRoomNo(this));
mpPath1 = dPath_GetRoomPath(i_pathNo, fopAcM_GetRoomNo(this));
}
}
@ -86,26 +96,112 @@ public:
void setBackHanjo() { mFlags |= 0x20; }
void setHanjoHand() { mFlags |= 0x40; }
void setQuickHanjoHand() { mFlags |= 0x200; }
BOOL isHanjoHand() { return field_0x6ad != 0; }
BOOL isHanjoHand() { return mIsHanjoHand != 0; }
private:
/* 0x568 */ u8 field_0x568[0x6ad - 0x568];
/* 0x6AD */ u8 field_0x6ad;
/* 0x568 */ u8 field_0x6ae[0x6BE - 0x6ae];
/* 0x568 */ request_of_phase_process_class mPhase;
/* 0x570 */ mDoExt_McaMorfSO* mpMorf;
/* 0x574 */ Z2Creature mSound;
/* 0x604 */ cXyz field_0x604;
/* 0x610 */ cXyz field_0x610;
/* 0x61C */ cXyz field_0x61c;
/* 0x628 */ cXyz field_0x628;
/* 0x634 */ fopAc_ac_c* field_0x634;
/* 0x638 */ daNpc_Hanjo_c* mpMaster;
/* 0x63C */ cXyz field_0x63c[5];
/* 0x678 */ f32 field_0x678;
/* 0x67D */ f32 field_0x67c;
/* 0x67E */ f32 field_0x680;
/* 0x67E */ f32 field_0x684;
/* 0x688 */ s32 field_0x688;
/* 0x68C */ s32 mActionType;
/* 0x690 */ s32 field_0x690;
/* 0x694 */ s32 field_0x694;
/* 0x698 */ s32 field_0x698;
/* 0x69C */ s16 field_0x69c;
/* 0x69E */ s16 field_0x69e;
/* 0x6A0 */ s16 field_0x6a0;
/* 0x6A2 */ s16 field_0x6a2;
/* 0x6A4 */ s16 field_0x6a4;
/* 0x6A5 */ s16 field_0x6a6;
/* 0x6A8 */ s16 field_0x6a8;
/* 0x6AA */ s16 field_0x6aa;
/* 0x6AC */ u8 mCarryType;
/* 0x6AD */ u8 mIsHanjoHand;
/* 0x6AE */ u8 field_0x6ae;
/* 0x6B0 */ s32 field_0x6b0;
/* 0x6B4 */ s32 field_0x6b4;
/* 0x6B8 */ s32 field_0x6b8;
/* 0x6BC */ bool mIsExecutingAction;
/* 0x6BD */ u8 field_0x6bd;
/* 0x6BE */ u16 mFlags;
/* 0x6C0 */ u8 field_0x6c0[0x6C8 - 0x6C0];
/* 0x6C8 */ dPath* field_0x6c8;
/* 0x6CC */ u8 field_0x6cc[0x71a - 0x6CC];
/* 0x6C0 */ u8 field_0x6c0;
/* 0x6C1 */ u8 field_0x6c1;
/* 0x6C2 */ u8 field_0x6c2;
/* 0x6C3 */ u8 field_0x6c3;
/* 0x6C4 */ u8 field_0x6c4;
/* 0x6C5 */ u8 field_0x6c5;
/* 0x6C6 */ u8 field_0x6c6;
/* 0x6C7 */ u8 field_0x6c7;
/* 0x6C8 */ dPath* mpPath1;
/* 0x6CC */ s8 mPathStep2;
/* 0x6D0 */ dPathCurve field_0x6d0;
/* 0x6DC */ dPath* mWolfPathData;
/* 0x6E0 */ f32 field_0x6e0;
/* 0x6E4 */ f32 field_0x6e4;
/* 0x6E8 */ u8 field_0x6e8;
/* 0x6E9 */ u8 field_0x6e9;
/* 0x6EA */ u8 field_0x6ea;
/* 0x6EB */ u8 field_0x6eb;
/* 0x6EC */ fopAc_ac_c* field_0x6ec;
/* 0x6F0 */ cXyz field_0x6f0;
/* 0x6FC */ cXyz field_0x6fc;
/* 0x708 */ f32 field_0x708;
/* 0x70C */ s32 field_0x70c;
/* 0x710 */ s16 field_0x710;
/* 0x714 */ f32 field_0x714;
/* 0x718 */ u8 field_0x718;
/* 0x719 */ u8 field_0x719;
/* 0x71A */ u8 field_0x71a;
/* 0x6CC */ u8 field_0x71b[0xB44 - 0x71b];
/* 0x71B */ u8 field_0x71b[0x724 - 0x71b];
/* 0x724 */ dMsgFlow_c mMsgFlow;
/* 0x770 */ dBgS_AcchCir mCircle;
/* 0x7B0 */ dBgS_ObjAcch mAcch;
/* 0x988 */ dCcD_Stts mStts;
/* 0x9C4 */ dCcD_Sph mSphere;
/* 0xAFC */ dCcU_AtInfo mAtInfo;
/* 0xB20 */ u32 field_0xb20;
/* 0xB24 */ u32 field_0xb24;
/* 0xB28 */ u32 field_0xb28[4];
/* 0x71A */ u32 field_0xb38;
/* 0xB3C */ s32 field_0xb3c;
/* 0xB40 */ u8 field_0xb40;
};
STATIC_ASSERT(sizeof(daNPC_TK_c) == 0xB44);
class daNPC_TK_HIO_c {
class daNPC_TK_HIO_c : public JORReflexible {
public:
daNPC_TK_HIO_c();
~daNPC_TK_HIO_c();
virtual ~daNPC_TK_HIO_c() {}
void genMessage(JORMContext*) {}
s8 field_0x4;
f32 field_0x8;
f32 field_0xc;
f32 field_0x10;
f32 field_0x14;
f32 field_0x18;
f32 field_0x1c;
f32 field_0x20;
f32 field_0x24;
f32 field_0x28;
f32 mFlySpeed;
f32 field_0x30;
f32 field_0x34;
f32 field_0x38;
u8 field_0x3c;
};

16
include/d/actor/d_a_obj_pumpkin.h
View File

@ -32,8 +32,22 @@ public:
/* 80CB7E98 */ void setHamonPrtcl();
/* 80CB7EF4 */ void crash();
void setMtx(MtxP mtx) {
cXyz newPos;
field_0xbb3 = 1;
mDoMtx_stack_c::copy(mtx);
mDoMtx_stack_c::multVecZero(&newPos);
current.pos = newPos;
old.pos = current.pos;
mpModel->setBaseTRMtx(mtx);
}
private:
/* 0x568 */ u8 field_0x568[0xbbc - 0x568];
/* 0x568 */ u8 field_0x568[0x574 - 0x568];
/* 0x574 */ J3DModel* mpModel;
/* 0x578 */ u8 field_0x578[0xbb3 - 0x578];
/* 0xB7C */ u8 field_0xbb3;
/* 0xB7E */ u8 field_0xbb4[0xbbc - 0xbb4];
};
STATIC_ASSERT(sizeof(daObj_Pumpkin_c) == 0xbbc);

6
include/d/actor/d_a_player.h
View File

@ -1156,7 +1156,7 @@ public:
}
void onFishingRelease() {
this->mEndResetFlg0 |= 0x4000000;
onEndResetFlg0(ERFLG0_UNK_4000000);
}
static daMidna_c* m_midnaActor;
@ -1165,6 +1165,10 @@ public:
void setGiantPuzzleEnd() { mSpecialMode = 0; }
BOOL checkAutoJumpStart() const { return checkResetFlg0(RFLG0_UNK_100); }
void onForceGrabRebound() {
onEndResetFlg2(ERFLG2_UNK_8);
}
};
int daPy_addCalcShort(s16* param_0, s16 param_1, s16 param_2, s16 param_3, s16 param_4);

16
include/f_op/f_op_actor_mng.h
View File

@ -142,6 +142,7 @@ enum fopAcM_STATUS {
/* 0x2000000 */ fopAcM_STATUS_UNK_20000000 = 1 << 25,
/* 0x4000000 */ fopAcM_STATUS_UNK_40000000 = 1 << 26,
/* 0x8000000 */ fopAcM_STATUS_UNK_80000000 = 1 << 27,
/* 0x8000000 */ fopAcM_STATUS_HAWK_CARRY_NOW = 1 << 31,
};
inline s8 fopAcM_GetRoomNo(const fopAc_ac_c* i_actor) {
@ -180,7 +181,7 @@ enum fopAcM_CARRY {
/* 0x80 */ fopAcM_CARRY_CHICKEN = 0x80,
};
inline u32 fopAcM_CheckCarryType(fopAc_ac_c* actor, fopAcM_CARRY type) {
inline u32 fopAcM_CheckCarryType(const fopAc_ac_c* actor, fopAcM_CARRY type) {
return actor->carryType & type;
}
@ -284,6 +285,14 @@ inline void fopAcM_cancelHookCarryNow(fopAc_ac_c* actor) {
fopAcM_OffStatus(actor, fopAcM_STATUS_HOOK_CARRY_NOW);
}
inline void fopAcM_setHawkCarryNow(fopAc_ac_c* actor) {
fopAcM_OnStatus(actor, fopAcM_STATUS_HAWK_CARRY_NOW);
}
inline void fopAcM_cancelHawkCarryNow(fopAc_ac_c* actor) {
fopAcM_OffStatus(actor, fopAcM_STATUS_HAWK_CARRY_NOW);
}
inline s8 fopAcM_GetHomeRoomNo(const fopAc_ac_c* i_actor) {
return i_actor->home.roomNo;
}
@ -463,6 +472,11 @@ inline void fopAcM_offDraw(fopAc_ac_c* i_actor) {
fopDwTg_DrawQTo(&i_actor->draw_tag);
}
inline int fopAcM_monsSeStart(const fopAc_ac_c* i_actor, u32 i_soundId, u32 param_2) {
return mDoAud_monsSeStart(i_soundId, &i_actor->eyePos, fopAcM_GetID(i_actor), param_2,
dComIfGp_getReverb(fopAcM_GetRoomNo(i_actor)));
}
void fopAcM_initManager();
fopAc_ac_c* fopAcM_FastCreate(s16 i_procName, FastCreateReqFunc i_createFunc, void* i_createData,

7
include/m_Do/m_Do_audio.h
View File

@ -289,4 +289,11 @@ inline void mDoAud_talkIn() {
Z2AudioMgr::getInterface()->talkIn();
}
inline int mDoAud_monsSeStart(u32 i_soundId, const Vec* i_pos, u32 i_actorId, u32 param_3,
s8 i_reverb) {
(void)i_actorId;
return Z2GetAudioMgr()->seStart(i_soundId, i_pos, param_3, i_reverb, 1.0f, 1.0f, -1.0f, -1.0f,
0);
}
#endif /* M_DO_M_DO_AUDIO_H */

2
src/d/actor/d_a_e_hz.cpp
View File

@ -600,7 +600,7 @@ static u8 m_near_weapon[4];
#pragma pop
/* 806EA9B8-806EAADC 000498 0124+00 2/2 0/0 0/0 .text s_obj_sub__FPvPv */
static void s_obj_sub(void* param_0, void* param_1) {
static s32 s_obj_sub(void* param_0, void* param_1) {
// NONMATCHING
}

2
src/d/actor/d_a_e_sb.cpp
View File

@ -433,7 +433,7 @@ static void other_bg_check(daE_SB_c* param_0, fopAc_ac_c* param_1) {
}
/* 80781C2C-80781D34 0006CC 0108+00 2/2 0/0 0/0 .text s_obj_sub__FPvPv */
static void s_obj_sub(void* param_0, void* param_1) {
static s32 s_obj_sub(void* param_0, void* param_1) {
// NONMATCHING
}

2
src/d/actor/d_a_e_ww.cpp
View File

@ -738,7 +738,7 @@ COMPILER_STRIP_GATE(0x807EF7E0, &lit_4507);
#pragma pop
/* 807E8B2C-807E8C54 00152C 0128+00 1/1 0/0 0/0 .text s_obj_sub__FPvPv */
static void s_obj_sub(void* param_0, void* param_1) {
static s32 s_obj_sub(void* param_0, void* param_1) {
// NONMATCHING
}

4784
src/d/actor/d_a_npc_tk.cpp
View File

File diff suppressed because it is too large Load Diff

2
src/d/actor/d_a_obj_crvfence.cpp
View File

@ -302,7 +302,7 @@ SECTION_RODATA static f32 const lit_3845 = 600.0f;
COMPILER_STRIP_GATE(0x80BD01C8, &lit_3845);
/* 80BCF390-80BCF404 000770 0074+00 1/1 0/0 0/0 .text s_obj_sub__FPvPv */
static void s_obj_sub(void* param_0, void* param_1) {
static s32 s_obj_sub(void* param_0, void* param_1) {
// NONMATCHING
}

3
src/d/actor/d_a_obj_flag2.cpp
View File

@ -14,6 +14,7 @@
#ifdef DEBUG
class daObjFlag2_Hio_c : public JORReflexible {
public:
daObjFlag2_Hio_c() {
mCount = 0;
default_set();
@ -26,7 +27,7 @@ class daObjFlag2_Hio_c : public JORReflexible {
ctx->genSlider("重力", &mAttr.mGravity, -10.0f, 0.0f, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
ctx->genSlider("バネ係数", &mAttr.mSpringCoeeficient, 0.0f, 10.0f, 0, NULL, 0xffff, 0xffff,
0x200, 0x18);
ctx->genSlider("減衰率", &mAttr.mAttenuationRate, 0.0f, 1.0f, 0, NULL, 0xffff, 0xffff,
ctx->genSlider("減衰率", &mAttr.mDecayRate, 0.0f, 1.0f, 0, NULL, 0xffff, 0xffff,
0x200, 0x18);
ctx->genSlider("風係数", &mAttr.mWindCoefficient, 0.0f, 100.0f, 0, NULL, 0xffff, 0xffff,
0x200, 0x18);

1
src/d/actor/d_a_obj_kago.cpp
View File

@ -4,6 +4,7 @@
*/
#include "d/actor/d_a_obj_kago.h"
#include "SSystem/SComponent/c_counter.h"
#include "Z2AudioLib/Z2Instances.h"
#include "d/actor/d_a_npc.h"
#include "d/d_cc_d.h"