mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-09-02 16:47:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_tbox2 done, f_op_actor_mng cleanup, cleanup fopAc_ac_c member names (#2084)

Browse Source
This commit is contained in:
TakaRikka
2024-03-04 17:33:13 -08:00
committed by GitHub
parent 1a421c4a4e
commit dede32dbc9
334 changed files with 3797 additions and 6195 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/a/d_a_alink.h
+3 -3
View File
@@ -1813,7 +1813,7 @@ public:
/* 800DC474 */ int procCoSwimFreezeReturn();
/* 800DC548 */ static BOOL checkEnemyGroup(fopAc_ac_c*);
/* 800DC5A4 */ static BOOL checkSpecialNpc(fopAc_ac_c*);
/* 800DC5DC */ bool checkShieldAttackEmphasys();
/* 800DC5DC */ BOOL checkShieldAttackEmphasys();
/* 800DC678 */ BOOL checkGuardActionChange();
/* 800DC79C */ void stickArrowIncrement(int);
/* 800DC8C4 */ void setArrowShieldActor(fopAc_ac_c*, int);
@@ -3262,7 +3262,7 @@ public:
var_r5 = 0;
if (mItemAcKeep.getActor() != NULL &&
mItemAcKeep.getActor()->mEvtInfo.i_checkCommandDemoAccrpt() != 0) {
mItemAcKeep.getActor()->eventInfo.i_checkCommandDemoAccrpt() != 0) {
var_r5 = 1;
}
@@ -3559,7 +3559,7 @@ private:
/* 0x02854 */ daPy_actorKeep_c mCargoCarryAcKeep;
/* 0x0285C */ daPy_actorKeep_c field_0x285c;
/* 0x02864 */ dMsgFlow_c mMsgFlow;
/* 0x028B0 */ int field_0x28b0[0x10];
/* 0x028B0 */ unsigned int mShieldArrowIDs[16];
/* 0x028F0 */ unsigned int mMsgClassID;
/* 0x028F4 */ int mAtnActorID;
/* 0x028F8 */ int field_0x28f8;
include/d/a/d_a_npc.h
+3 -3
View File
@@ -259,7 +259,7 @@ public:
/* 0xD90 */ u32 field_0xd90;
/* 0xD94 */ u32 field_0xd94;
/* 0xD98 */ u32 field_0xd98;
/* 0xD9C */ profile_method_class* mSubMtd;
/* 0xD9C */ profile_method_class* sub_method;
/* 0xDA0 */ u8 field_0xda0[8];
/* 0xDA8 */ u32 field_0xda8;
/* 0xDAC */ int field_0xdac;
@@ -640,13 +640,13 @@ public:
/* 80155BCC */ virtual void drawOtherMdls();
BOOL chkActorInSpeakArea(fopAc_ac_c* i_actorCheck, fopAc_ac_c* i_actorArea) {
return chkActorInAttnArea(i_actorCheck, i_actorArea, mAttentionInfo.field_0x0[3]);
return chkActorInAttnArea(i_actorCheck, i_actorArea, attention_info.field_0x0[3]);
}
BOOL chkPlayerInSpeakArea(fopAc_ac_c* i_actor) {
return chkActorInSpeakArea(daPy_getPlayerActorClass(), i_actor);
}
BOOL chkActorInTalkArea(fopAc_ac_c* i_actorCheck, fopAc_ac_c* i_actorArea) {
return chkActorInAttnArea(i_actorCheck, i_actorArea, mAttentionInfo.field_0x0[1]);
return chkActorInAttnArea(i_actorCheck, i_actorArea, attention_info.field_0x0[1]);
}
BOOL chkPlayerInTalkArea(fopAc_ac_c* i_actor) {
return chkActorInTalkArea(daPy_getPlayerActorClass(), i_actor);
include/d/d_item.h
+1
View File
@@ -396,5 +396,6 @@ int isBomb(u8);
int isArrow(u8);
int addBombCount(u8, u8);
BOOL isBottleItem(u8 item_no);
u8 check_itemno(int i_itemNo);
#endif /* D_D_ITEM_H */