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

d_a_npc_grs matching (#2827)

This commit is contained in:
Max Roncace 2025-11-19 16:27:28 -05:00 committed by GitHub
parent 4373bba251
commit 8956be538e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 1257 additions and 1197 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/GZ2E01/rels/d_a_npc_grs/symbols.txt
View File

@ -188,6 +188,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa
@4050 = .bss:0x00000048; // type:object size:0xC scope:local
l_HIO = .bss:0x00000054; // type:object size:0x4 scope:global data:4byte
@4752 = .bss:0x00000058; // type:object size:0xC scope:local
init$4753 = .bss:0x00000064; // type:object size:0x1 scope:local
eyeOffset$4751 = .bss:0x00000068; // type:object size:0xC scope:local
sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000074; // type:object size:0x4 scope:global
sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000078; // type:object size:0x4 scope:global

1
config/GZ2J01/rels/d_a_npc_grs/symbols.txt
View File

@ -187,6 +187,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa
@4050 = .bss:0x00000048; // type:object size:0xC scope:local
l_HIO = .bss:0x00000054; // type:object size:0x4 scope:global data:4byte
@4752 = .bss:0x00000058; // type:object size:0xC scope:local
init$4753 = .bss:0x00000064; // type:object size:0x1 scope:local
eyeOffset$4751 = .bss:0x00000068; // type:object size:0xC scope:local
sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000074; // type:object size:0x4 scope:global
sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000078; // type:object size:0x4 scope:global

1
config/GZ2P01/rels/d_a_npc_grs/symbols.txt
View File

@ -187,6 +187,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa
@4050 = .bss:0x00000048; // type:object size:0xC scope:local
l_HIO = .bss:0x00000054; // type:object size:0x4 scope:global data:4byte
@4752 = .bss:0x00000058; // type:object size:0xC scope:local
init$4753 = .bss:0x00000064; // type:object size:0x1 scope:local
eyeOffset$4751 = .bss:0x00000068; // type:object size:0xC scope:local
sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000074; // type:object size:0x4 scope:global
sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000078; // type:object size:0x4 scope:global

2
configure.py
View File

@ -1878,7 +1878,7 @@ config.libs = [
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_grmc"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_gro", extra_cflags=[DANPCF_C_HACK]),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_grr", extra_cflags=[DANPCF_C_HACK]),
ActorRel(NonMatching, "d_a_npc_grs"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_grs", extra_cflags=[DANPCF_C_HACK]),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_grz", extra_cflags=[DANPCF_C_HACK]),
ActorRel(NonMatching, "d_a_npc_guard"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_gwolf", extra_cflags=[DANPCF_C_HACK]),

126
include/d/actor/d_a_npc_grs.h
View File

@ -3,6 +3,33 @@
#include "d/actor/d_a_npc.h"
struct daNpc_grS_HIOParam {
/* 0x000 */ daNpcF_HIOParam common;
};
class daNpc_grS_Param_c {
public:
/* 809E7D60 */ virtual ~daNpc_grS_Param_c() {}
static const daNpc_grS_HIOParam m;
};
#if DEBUG
class daNpc_grS_HIO_c : public mDoHIO_entry_c {
public:
daNpc_grS_HIO_c();
virtual ~daNpc_grS_HIO_c() {}
void genMessage(JORMContext*);
daNpc_grS_HIOParam m;
};
#define NPC_GRS_HIO_CLASS daNpc_grS_HIO_c
#else
#define NPC_GRS_HIO_CLASS daNpc_grS_Param_c
#endif
/**
* @ingroup actors-npcs
* @class daNpc_grS_c
@ -11,64 +38,81 @@
* @details
*
*/
class daNpc_grS_c : public fopAc_ac_c {
class daNpc_grS_c : public daNpcF_c {
public:
typedef int (daNpc_grS_c::*actionFunc)(void*);
typedef int (daNpc_grS_c::*cutFunc)(int);
/* 809E40CC */ daNpc_grS_c();
/* 809E42E0 */ ~daNpc_grS_c();
/* 809E44E0 */ void create();
/* 809E47B4 */ void CreateHeap();
/* 809E4C58 */ void Delete();
/* 809E4C8C */ void Execute();
/* 809E4CAC */ void Draw();
/* 809E4D3C */ void ctrlJoint(J3DJoint*, J3DModel*);
/* 809E4F70 */ void createHeapCallBack(fopAc_ac_c*);
/* 809E4F90 */ void ctrlJointCallBack(J3DJoint*, int);
/* 809E4FDC */ void setParam();
/* 809E510C */ void main();
/* 809E528C */ void ctrlBtk();
/* 809E536C */ void setAttnPos();
/* 809E5874 */ void setExpressionAnm(int, bool);
/* 809E5A08 */ void setExpressionBtp(int);
/* 809E5B1C */ void setExpression(int, f32);
/* 809E5B48 */ bool setMotionAnm(int, f32);
/* 809E5CB8 */ void setMotion(int, f32, int);
/* 809E5CFC */ bool drawDbgInfo();
/* 809E5D04 */ void drawOtherMdls();
/* 809E5DB4 */ void getTypeFromParam();
/* 809E5DD4 */ void isDelete();
/* 809E42E0 */ virtual ~daNpc_grS_c();
/* 809E44E0 */ int create();
/* 809E47B4 */ int CreateHeap();
/* 809E4C58 */ int Delete();
/* 809E4C8C */ int Execute();
/* 809E4CAC */ int Draw();
/* 809E4D3C */ int ctrlJoint(J3DJoint*, J3DModel*);
/* 809E4F70 */ static int createHeapCallBack(fopAc_ac_c*);
/* 809E4F90 */ static int ctrlJointCallBack(J3DJoint*, int);
/* 809E4FDC */ virtual void setParam();
/* 809E510C */ virtual int main();
/* 809E528C */ virtual int ctrlBtk();
/* 809E536C */ virtual void setAttnPos();
/* 809E5874 */ virtual bool setExpressionAnm(int, bool);
/* 809E5A08 */ virtual bool setExpressionBtp(int);
/* 809E5B1C */ virtual void setExpression(int, f32);
/* 809E5B48 */ virtual void setMotionAnm(int, f32);
/* 809E5CB8 */ virtual void setMotion(int, f32, int);
/* 809E5CFC */ virtual int drawDbgInfo();
/* 809E5D04 */ virtual void drawOtherMdls();
/* 809E5DB4 */ u8 getTypeFromParam();
/* 809E5DD4 */ int isDelete();
/* 809E5E58 */ void reset();
/* 809E6000 */ void playExpression();
/* 809E6164 */ void playMotion();
/* 809E62F0 */ void chkAction(int (daNpc_grS_c::*)(void*));
/* 809E631C */ void setAction(int (daNpc_grS_c::*)(void*));
/* 809E63C4 */ void selectAction();
/* 809E62F0 */ int chkAction(actionFunc);
/* 809E631C */ int setAction(actionFunc);
/* 809E63C4 */ int selectAction();
/* 809E6444 */ void doNormalAction(int);
/* 809E6570 */ void doEvent();
/* 809E6570 */ int doEvent();
/* 809E6854 */ void setLookMode(int);
/* 809E6878 */ void lookat();
/* 809E6B00 */ void setExpressionTalkAfter();
/* 809E6B74 */ void cutPushOut(int);
/* 809E6D54 */ void wait(void*);
/* 809E6F5C */ void talk(void*);
/* 809E721C */ void test(void*);
/* 809E6B74 */ int cutPushOut(int);
/* 809E6D54 */ int wait(void*);
/* 809E6F5C */ int talk(void*);
/* 809E721C */ int test(void*);
/* 809E7300 */ void setPrtcl();
/* 809E7D5C */ void adjustShapeAngle();
/* 809E7D5C */ void adjustShapeAngle() {}
static char* mEvtCutNameList[2];
static u8 mEvtCutList[24];
static cutFunc mEvtCutList[2];
private:
/* 0x568 */ u8 field_0x568[0xe38 - 0x568];
/* 0xB48 */ Z2Creature mSound;
/* 0xBD8 */ daNpcF_MatAnm_c* mpMatAnm;
/* 0xBDC */ J3DModel* mpModel;
/* 0xBE0 */ daNpcF_Lookat_c mLookat;
/* 0xC7C */ daNpcF_ActorMngr_c mActorMngrs[2];
/* 0xC8C */ NPC_GRS_HIO_CLASS* mpHIO;
/* 0xC90 */ dCcD_Cyl mCyl;
/* 0xDCC */ actionFunc mpNextActionFn;
/* 0xDD8 */ actionFunc mpActionFn;
/* 0xDE4 */ request_of_phase_process_class mPhases[2];
/* 0xDF4 */ u8 field_0xdf4[0xdfc - 0xdf4];
/* 0xDFC */ int field_0xdfc;
/* 0xE00 */ int field_0xe00;
/* 0xE04 */ int field_0xe04;
/* 0xE08 */ int field_0xe08;
/* 0xE0C */ int field_0xe0c;
/* 0xE10 */ s16 mLookMode;
/* 0xE12 */ u16 mActionState;
/* 0xE14 */ u8 mType;
/* 0xE18 */ fpc_ProcID mPresentItemId;
/* 0xE1C */ int mParticleIds[6];
/* 0xE34 */ bool mIsSpeaking;
};
STATIC_ASSERT(sizeof(daNpc_grS_c) == 0xe38);
class daNpc_grS_Param_c {
public:
/* 809E7D60 */ ~daNpc_grS_Param_c();
static u8 const m[108];
};
#endif /* D_A_NPC_GRS_H */

2323
src/d/actor/d_a_npc_grs.cpp
View File

File diff suppressed because it is too large Load Diff