Skip to content

Commit

Permalink
d_a_npc work (#2306)
Browse files Browse the repository at this point in the history
  • Loading branch information
@randomsalience
randomsalience authored Feb 23, 2025
1 parent 531a6d6 commit e3d0b94
Show file tree
Hide file tree
Showing 89 changed files with 2,026 additions and 2,913 deletions.
414 changes: 252 additions & 162 deletions include/d/actor/d_a_npc.h
View file

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions include/d/actor/d_a_npc_bou.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@ class daNpc_Bou_c : public daNpcT_c {
/* 809727B4 */ virtual s32 getEyeballMaterialNo();
/* 8096DD44 */ virtual void afterJntAnm(int);
/* 8096DDC8 */ virtual void setParam();
/* 8096DF9C */ virtual bool checkChangeEvt();
/* 8096E27C */ virtual bool evtTalk();
/* 8096E31C */ virtual bool evtEndProc();
/* 8096E324 */ virtual bool evtCutProc();
/* 8096DF9C */ virtual BOOL checkChangeEvt();
/* 8096E27C */ virtual BOOL evtTalk();
/* 8096E31C */ virtual BOOL evtEndProc();
/* 8096E324 */ virtual BOOL evtCutProc();
/* 8096E0EC */ virtual void setAfterTalkMotion();
/* 8096E3EC */ virtual void action();
/* 8096E7E0 */ virtual void beforeMove();
Expand All @@ -71,15 +71,15 @@ class daNpc_Bou_c : public daNpcT_c {

BOOL speakTo() {
if (field_0xf80 == 4) {
if (current.pos.absXZ(daPy_getPlayerActorClass()->current.pos) < 1100.0f && strlen(field_0x570[5].eventName) != 0) {
u32 len = strlen(field_0x574[field_0x570[5].num]);
if (current.pos.absXZ(daPy_getPlayerActorClass()->current.pos) < 1100.0f && strlen(mpEvtData[5].eventName) != 0) {
u32 len = strlen(mpArcNames[mpEvtData[5].num]);
if (len != 0) {
eventInfo.setArchiveName(field_0x574[field_0x570[5].num]);
eventInfo.setArchiveName(mpArcNames[mpEvtData[5].num]);
dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName());
}

field_0xe1c = dComIfGp_getEventManager().getEventIdx(this, field_0x570[5].eventName, 0xFF);
fopAcM_orderOtherEventId(this, field_0xe1c, 0xFF, 0xFFFF, 4, 1);
mEvtId = dComIfGp_getEventManager().getEventIdx(this, mpEvtData[5].eventName, 0xFF);
fopAcM_orderOtherEventId(this, mEvtId, 0xFF, 0xFFFF, 4, 1);
return 1;
}
}
Expand Down
6 changes: 3 additions & 3 deletions include/d/actor/d_a_npc_hanjo.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,11 +121,11 @@ class daNpc_Hanjo_c : public daNpcT_c {
/* 809F9D9C */ void reset();
/* 809F9FCC */ void afterJntAnm(int);
/* 809FA050 */ void setParam();
/* 809FA1C4 */ bool checkChangeEvt();
/* 809FA1C4 */ BOOL checkChangeEvt();
/* 809FA3B8 */ void setAfterTalkMotion();
/* 809FA45C */ void srchActors();
/* 809FA55C */ bool evtTalk();
/* 809FA5FC */ bool evtCutProc();
/* 809FA55C */ BOOL evtTalk();
/* 809FA5FC */ BOOL evtCutProc();
/* 809FA6C4 */ void action();
/* 809FA88C */ void beforeMove();
/* 809FAABC */ void afterMoved();
Expand Down
8 changes: 4 additions & 4 deletions include/d/actor/d_a_npc_hoz.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ class daNpc_Hoz_c : public daNpcT_c {
/* 80A021DC */ void setParam();
/* 80A0236C */ void setAfterTalkMotion();
/* 80A02370 */ void srchActors();
/* 80A02374 */ bool checkChangeEvt();
/* 80A023EC */ bool evtTalk();
/* 80A024D0 */ bool evtEndProc();
/* 80A0260C */ bool evtCutProc();
/* 80A02374 */ BOOL checkChangeEvt();
/* 80A023EC */ BOOL evtTalk();
/* 80A024D0 */ BOOL evtEndProc();
/* 80A0260C */ BOOL evtCutProc();
/* 80A026D4 */ int evtProc();
/* 80A02918 */ void action();
/* 80A029A0 */ void beforeMove();
Expand Down
16 changes: 8 additions & 8 deletions include/d/actor/d_a_npc_kolin.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ class daNpc_Kolin_c : public daNpcT_c {
/* 8055A498 */ virtual s32 getEyeballMaterialNo();
/* 80554EBC */ virtual void afterJntAnm(int);
/* 80554F48 */ virtual void setParam();
/* 80555118 */ virtual bool checkChangeEvt();
/* 80555448 */ virtual bool evtTalk();
/* 805554E8 */ virtual bool evtCutProc();
/* 80555118 */ virtual BOOL checkChangeEvt();
/* 80555448 */ virtual BOOL evtTalk();
/* 805554E8 */ virtual BOOL evtCutProc();
/* 8055523C */ virtual void setAfterTalkMotion();
/* 805555B0 */ virtual void action();
/* 8055574C */ virtual void beforeMove();
Expand All @@ -86,15 +86,15 @@ class daNpc_Kolin_c : public daNpcT_c {
var_r29 = 2;
}

if (strlen(field_0x570[var_r29].eventName) != 0) {
u32 len = strlen(field_0x574[field_0x570[var_r29].num]);
if (strlen(mpEvtData[var_r29].eventName) != 0) {
u32 len = strlen(mpArcNames[mpEvtData[var_r29].num]);
if (len != 0) {
eventInfo.setArchiveName(field_0x574[field_0x570[var_r29].num]);
eventInfo.setArchiveName(mpArcNames[mpEvtData[var_r29].num]);
dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName());
}

field_0xe1c = dComIfGp_getEventManager().getEventIdx(this, field_0x570[var_r29].eventName, 0xFF);
fopAcM_orderOtherEventId(this, field_0xe1c, 0xFF, 0xFFFF, 4, 1);
mEvtId = dComIfGp_getEventManager().getEventIdx(this, mpEvtData[var_r29].eventName, 0xFF);
fopAcM_orderOtherEventId(this, mEvtId, 0xFF, 0xFFFF, 4, 1);
return 1;
}
}
Expand Down
6 changes: 3 additions & 3 deletions include/d/actor/d_a_obj_sekizoa.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ class daObj_Sekizoa_c : public daNpcT_c {
/* 80CD5B74 */ s32 getHeadJointNo();
/* 80CCF358 */ void afterJntAnm(int);
/* 80CCF3E4 */ void setParam();
/* 80CCF6BC */ bool checkChangeEvt();
/* 80CCF9A8 */ bool evtTalk();
/* 80CCFAA8 */ bool evtCutProc();
/* 80CCF6BC */ BOOL checkChangeEvt();
/* 80CCF9A8 */ BOOL evtTalk();
/* 80CCFAA8 */ BOOL evtCutProc();
/* 80CCF704 */ void setAfterTalkMotion();
/* 80CCFBA0 */ void action();
/* 80CCFD08 */ void beforeMove();
Expand Down
4 changes: 1 addition & 3 deletions include/d/d_attention.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ class dAttention_c {
/* 8016E424 */ void LockEdge();
/* 80182994 */ void GetCheckObjectCount();
/* 80182AD0 */ void keepLock(int);
/* 8014B010 */ static dist_entry& getDistTable(int);
/* 8014B010 */ static dist_entry& getDistTable(int i_no) { return dist_table[i_no]; }

fopAc_ac_c* getCatghTarget() { return mCatghTarget.getCatghTarget(); }
fopAc_ac_c* getZHintTarget() { return mZHintTarget.getZHintTarget(); }
Expand Down Expand Up @@ -253,8 +253,6 @@ class dAttention_c {
mPadNo = i_padNo;
}

static dist_entry& i_getDistTable(int i_no) { return dist_table[i_no]; }

static type_tbl_entry loc_type_tbl[3];
static type_tbl_entry act_type_tbl[5];
static dist_entry dist_table[234];
Expand Down
2 changes: 1 addition & 1 deletion include/d/d_com_inf_game.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3258,7 +3258,7 @@ inline void dComIfGp_roomControl_init() {
g_dComIfG_gameInfo.play.getRoomControl()->init();
}

inline dStage_roomStatus_c* dComIfGp_roomControl_getStatusRoomDt(int room_no) {
inline dStage_roomDt_c* dComIfGp_roomControl_getStatusRoomDt(int room_no) {
return g_dComIfG_gameInfo.play.getRoomControl()->getStatusRoomDt(room_no);
}

Expand Down
2 changes: 1 addition & 1 deletion include/d/d_stage.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -804,7 +804,7 @@ class dStage_roomControl_c {
void init(void);
static int getZoneNo(int i_roomNo) { return mStatus[i_roomNo].getZoneNo(); }
/* 80024338 */ void initZone();
/* 80024384 */ dStage_roomStatus_c* getStatusRoomDt(int);
/* 80024384 */ dStage_roomDt_c* getStatusRoomDt(int);
/* 800243B0 */ static JKRExpHeap* getMemoryBlock(int);
/* 800243E8 */ static void setStayNo(int);
/* 80024424 */ static void setNextStayNo(int);
Expand Down
Loading

0 comments on commit e3d0b94

Please sign in to comment.