Skip to content

d_a_npc_shop0 matching #2374

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
hatal175 merged 3 commits into from
Apr 6, 2025
Merged

d_a_npc_shop0 matching #2374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
37a8f67
d_a_npc_shop0 matching
vladzhdanov Apr 5, 2025
ab10a69
d_a_npc_shop0 matching
vladzhdanov Apr 5, 2025
8a90fcc
Merge branch 'main' of https://github.com/vladzhdanov/tp into main
vladzhdanov Apr 6, 2025
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
2 changes: 1 addition & 1 deletion configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1800,7 +1800,7 @@ def MatchingFor(*versions):
ActorRel(NonMatching, "d_a_npc_shad"),
ActorRel(NonMatching, "d_a_npc_shaman"),
ActorRel(NonMatching, "d_a_npc_shoe"),
ActorRel(NonMatching, "d_a_npc_shop0"),
ActorRel(MatchingFor("GZ2E01"), "d_a_npc_shop0"),
ActorRel(Equivalent, "d_a_npc_shop_maro"), # weak function order
ActorRel(NonMatching, "d_a_npc_sola"),
ActorRel(NonMatching, "d_a_npc_soldierA"),
Expand Down
83 changes: 53 additions & 30 deletions include/d/actor/d_a_npc_shop0.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,46 +11,69 @@
* @details
*
*/

class daNpc_Shop0_Param_c {
public:
/* 80AEBB14 */ virtual ~daNpc_Shop0_Param_c() {};

struct param {
/* 0x0 */ u32 mParam1;
/* 0x4 */ u32 mParam2;
/* 0x8 */ u32 mParam3;
};

static param const mParam;
};


class daNpc_Shop0_c : public fopAc_ac_c {
public:
/* 80AEA7F8 */ ~daNpc_Shop0_c();
/* 80AEAA10 */ void create();
/* 80AEAE9C */ void createHeap();
/* 80AEAF8C */ void destroy();
/* 80AEAFC0 */ void execute();
/* 80AEB078 */ void draw();
/* 80AEB190 */ void getResName();
/* 80AEA7F8 */ virtual ~daNpc_Shop0_c();
/* 80AEAA10 */ int create();
/* 80AEAE9C */ int createHeap();
/* 80AEAF8C */ int destroy();
/* 80AEAFC0 */ int execute();
/* 80AEB078 */ int draw();
/* 80AEB190 */ char* getResName();
/* 80AEB1A0 */ void getParam();
/* 80AEB1C8 */ void getFlowNodeNum();
/* 80AEB1D0 */ void isDelete();
/* 80AEB22C */ void init();
/* 80AEB32C */ void getTrnsfrmAnmP(int, char**);
/* 80AEB3A8 */ void setBckAnm(J3DAnmTransform*, f32, int, int, int, bool);
/* 80AEB45C */ void setCollision();
/* 80AEB4C8 */ void checkEvent();
/* 80AEB1C8 */ int getFlowNodeNum();
/* 80AEB1D0 */ int isDelete();
/* 80AEB22C */ int init();
/* 80AEB32C */ J3DAnmTransform* getTrnsfrmAnmP(int, char**);
/* 80AEB3A8 */ int setBckAnm(J3DAnmTransform*, f32, int, int, int, bool);
/* 80AEB45C */ int setCollision();
/* 80AEB4C8 */ int checkEvent();
/* 80AEB5E8 */ void orderEvent();
/* 80AEB634 */ void setMtx();
/* 80AEB6DC */ void setRoomInf();
/* 80AEB780 */ void cut_alert(int, int);
/* 80AEB7F0 */ void chkProcess(int (daNpc_Shop0_c::*)(void*));
/* 80AEB824 */ void setProcess(int (daNpc_Shop0_c::*)(void*), void*, int);
/* 80AEB920 */ void wait(void*);
/* 80AEB9BC */ void talk(void*);
/* 80AEB780 */ int cut_alert(int, int);
/* 80AEB7F0 */ int chkProcess(int (daNpc_Shop0_c::*)(void*));
/* 80AEB824 */ int setProcess(int (daNpc_Shop0_c::*)(void*), void*, int);
/* 80AEB920 */ int wait(void*);
/* 80AEB9BC */ int talk(void*);

static u8 const mCylDat[68];
static dCcD_SrcCyl const mCylDat;

private:
/* 0x568 */ u8 field_0x568[0x9ec - 0x568];
/* 0x56c */ u8 mParam;
/* 0x570 */ mDoExt_bckAnm mBckAnm;
/* 0x58c */ f32 mPlaySpeed;
/* 0x590 */ u32 mFlowNodeNum;
/* 0x594 */ dMsgFlow_c mMsgFlow;
/* 0x5e0 */ request_of_phase_process_class mPhaseReq;
/* 0x5e8 */ J3DModel* mpModel;
/* 0x5ec */ f32 mGroundCross;
/* 0x5f0 */ dBgS_ObjGndChk mGndChk;
/* 0x644 */ daNpc_Shop0_Param_c* mpShopParam;
/* 0x648 */ dBgS_AcchCir mAcchCir;
/* 0x688 */ dBgS_ObjAcch mAcch;
/* 0x860 */ dCcD_Stts mStts;
/* 0x89c */ dCcD_Cyl mCyl;
/* 0x9d8 */ s32 mMode;
/* 0x9dc */ int (daNpc_Shop0_c::*mProcess)(void*);
/* 0x9e8 */ s16 field_0x9e8;
/* 0x9ea */ u8 field_0x9ea;
};

STATIC_ASSERT(sizeof(daNpc_Shop0_c) == 0x9ec);

class daNpc_Shop0_Param_c {
public:
/* 80AEBB14 */ ~daNpc_Shop0_Param_c();

static u8 const mParam[12];
};


#endif /* D_A_NPC_SHOP0_H */
Loading