Skip to content

Commit e3d0b94

Browse files
randomsaliencerandomsalience
authored
d_a_npc work (#2306)
1 parent 531a6d6 commit e3d0b94

File tree

89 files changed

+2026
-2913
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+2026
-2913
lines changed

‎include/d/actor/d_a_npc.h‎

Lines changed: 252 additions & 162 deletions
Large diffs are not rendered by default.

‎include/d/actor/d_a_npc_bou.h‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ class daNpc_Bou_c : public daNpcT_c {
5454
/* 809727B4 */ virtual s32 getEyeballMaterialNo();
5555
/* 8096DD44 */ virtual void afterJntAnm(int);
5656
/* 8096DDC8 */ virtual void setParam();
57-
/* 8096DF9C */ virtual bool checkChangeEvt();
58-
/* 8096E27C */ virtual bool evtTalk();
59-
/* 8096E31C */ virtual bool evtEndProc();
60-
/* 8096E324 */ virtual bool evtCutProc();
57+
/* 8096DF9C */ virtual BOOL checkChangeEvt();
58+
/* 8096E27C */ virtual BOOL evtTalk();
59+
/* 8096E31C */ virtual BOOL evtEndProc();
60+
/* 8096E324 */ virtual BOOL evtCutProc();
6161
/* 8096E0EC */ virtual void setAfterTalkMotion();
6262
/* 8096E3EC */ virtual void action();
6363
/* 8096E7E0 */ virtual void beforeMove();
@@ -71,15 +71,15 @@ class daNpc_Bou_c : public daNpcT_c {
7171

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

81-
field_0xe1c = dComIfGp_getEventManager().getEventIdx(this, field_0x570[5].eventName, 0xFF);
82-
fopAcM_orderOtherEventId(this, field_0xe1c, 0xFF, 0xFFFF, 4, 1);
81+
mEvtId = dComIfGp_getEventManager().getEventIdx(this, mpEvtData[5].eventName, 0xFF);
82+
fopAcM_orderOtherEventId(this, mEvtId, 0xFF, 0xFFFF, 4, 1);
8383
return 1;
8484
}
8585
}

‎include/d/actor/d_a_npc_hanjo.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,11 @@ class daNpc_Hanjo_c : public daNpcT_c {
121121
/* 809F9D9C */ void reset();
122122
/* 809F9FCC */ void afterJntAnm(int);
123123
/* 809FA050 */ void setParam();
124-
/* 809FA1C4 */ bool checkChangeEvt();
124+
/* 809FA1C4 */ BOOL checkChangeEvt();
125125
/* 809FA3B8 */ void setAfterTalkMotion();
126126
/* 809FA45C */ void srchActors();
127-
/* 809FA55C */ bool evtTalk();
128-
/* 809FA5FC */ bool evtCutProc();
127+
/* 809FA55C */ BOOL evtTalk();
128+
/* 809FA5FC */ BOOL evtCutProc();
129129
/* 809FA6C4 */ void action();
130130
/* 809FA88C */ void beforeMove();
131131
/* 809FAABC */ void afterMoved();

‎include/d/actor/d_a_npc_hoz.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ class daNpc_Hoz_c : public daNpcT_c {
3838
/* 80A021DC */ void setParam();
3939
/* 80A0236C */ void setAfterTalkMotion();
4040
/* 80A02370 */ void srchActors();
41-
/* 80A02374 */ bool checkChangeEvt();
42-
/* 80A023EC */ bool evtTalk();
43-
/* 80A024D0 */ bool evtEndProc();
44-
/* 80A0260C */ bool evtCutProc();
41+
/* 80A02374 */ BOOL checkChangeEvt();
42+
/* 80A023EC */ BOOL evtTalk();
43+
/* 80A024D0 */ BOOL evtEndProc();
44+
/* 80A0260C */ BOOL evtCutProc();
4545
/* 80A026D4 */ int evtProc();
4646
/* 80A02918 */ void action();
4747
/* 80A029A0 */ void beforeMove();

‎include/d/actor/d_a_npc_kolin.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ class daNpc_Kolin_c : public daNpcT_c {
6161
/* 8055A498 */ virtual s32 getEyeballMaterialNo();
6262
/* 80554EBC */ virtual void afterJntAnm(int);
6363
/* 80554F48 */ virtual void setParam();
64-
/* 80555118 */ virtual bool checkChangeEvt();
65-
/* 80555448 */ virtual bool evtTalk();
66-
/* 805554E8 */ virtual bool evtCutProc();
64+
/* 80555118 */ virtual BOOL checkChangeEvt();
65+
/* 80555448 */ virtual BOOL evtTalk();
66+
/* 805554E8 */ virtual BOOL evtCutProc();
6767
/* 8055523C */ virtual void setAfterTalkMotion();
6868
/* 805555B0 */ virtual void action();
6969
/* 8055574C */ virtual void beforeMove();
@@ -86,15 +86,15 @@ class daNpc_Kolin_c : public daNpcT_c {
8686
var_r29 = 2;
8787
}
8888

89-
if (strlen(field_0x570[var_r29].eventName) != 0) {
90-
u32 len = strlen(field_0x574[field_0x570[var_r29].num]);
89+
if (strlen(mpEvtData[var_r29].eventName) != 0) {
90+
u32 len = strlen(mpArcNames[mpEvtData[var_r29].num]);
9191
if (len != 0) {
92-
eventInfo.setArchiveName(field_0x574[field_0x570[var_r29].num]);
92+
eventInfo.setArchiveName(mpArcNames[mpEvtData[var_r29].num]);
9393
dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName());
9494
}
9595

96-
field_0xe1c = dComIfGp_getEventManager().getEventIdx(this, field_0x570[var_r29].eventName, 0xFF);
97-
fopAcM_orderOtherEventId(this, field_0xe1c, 0xFF, 0xFFFF, 4, 1);
96+
mEvtId = dComIfGp_getEventManager().getEventIdx(this, mpEvtData[var_r29].eventName, 0xFF);
97+
fopAcM_orderOtherEventId(this, mEvtId, 0xFF, 0xFFFF, 4, 1);
9898
return 1;
9999
}
100100
}

‎include/d/actor/d_a_obj_sekizoa.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ class daObj_Sekizoa_c : public daNpcT_c {
5858
/* 80CD5B74 */ s32 getHeadJointNo();
5959
/* 80CCF358 */ void afterJntAnm(int);
6060
/* 80CCF3E4 */ void setParam();
61-
/* 80CCF6BC */ bool checkChangeEvt();
62-
/* 80CCF9A8 */ bool evtTalk();
63-
/* 80CCFAA8 */ bool evtCutProc();
61+
/* 80CCF6BC */ BOOL checkChangeEvt();
62+
/* 80CCF9A8 */ BOOL evtTalk();
63+
/* 80CCFAA8 */ BOOL evtCutProc();
6464
/* 80CCF704 */ void setAfterTalkMotion();
6565
/* 80CCFBA0 */ void action();
6666
/* 80CCFD08 */ void beforeMove();

‎include/d/d_attention.h‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ class dAttention_c {
216216
/* 8016E424 */ void LockEdge();
217217
/* 80182994 */ void GetCheckObjectCount();
218218
/* 80182AD0 */ void keepLock(int);
219-
/* 8014B010 */ static dist_entry& getDistTable(int);
219+
/* 8014B010 */ static dist_entry& getDistTable(int i_no) { return dist_table[i_no]; }
220220

221221
fopAc_ac_c* getCatghTarget() { return mCatghTarget.getCatghTarget(); }
222222
fopAc_ac_c* getZHintTarget() { return mZHintTarget.getZHintTarget(); }
@@ -253,8 +253,6 @@ class dAttention_c {
253253
mPadNo = i_padNo;
254254
}
255255

256-
static dist_entry& i_getDistTable(int i_no) { return dist_table[i_no]; }
257-
258256
static type_tbl_entry loc_type_tbl[3];
259257
static type_tbl_entry act_type_tbl[5];
260258
static dist_entry dist_table[234];

‎include/d/d_com_inf_game.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3258,7 +3258,7 @@ inline void dComIfGp_roomControl_init() {
32583258
g_dComIfG_gameInfo.play.getRoomControl()->init();
32593259
}
32603260

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

‎include/d/d_stage.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -804,7 +804,7 @@ class dStage_roomControl_c {
804804
void init(void);
805805
static int getZoneNo(int i_roomNo) { return mStatus[i_roomNo].getZoneNo(); }
806806
/* 80024338 */ void initZone();
807-
/* 80024384 */ dStage_roomStatus_c* getStatusRoomDt(int);
807+
/* 80024384 */ dStage_roomDt_c* getStatusRoomDt(int);
808808
/* 800243B0 */ static JKRExpHeap* getMemoryBlock(int);
809809
/* 800243E8 */ static void setStayNo(int);
810810
/* 80024424 */ static void setNextStayNo(int);

0 commit comments

Comments
 (0)