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

scannon / scannon_crs / scannon_ten done (#2632)

Browse Source 
* scannon done

* scannon_crs done

* scannon_ten done

* pr

* attention debug stuff

* attn flags

* fix build
This commit is contained in:
TakaRikka
2025-09-08 02:01:20 -07:00
committed by GitHub
parent b35204b0c8
commit 5fce8ea1e1
244 changed files with 3067 additions and 3159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+3 -3
View File
@@ -2126,9 +2126,9 @@ config.libs = [
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_saidan"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_sakuita"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_sakuita_rope"),
ActorRel(NonMatching, "d_a_obj_scannon"),
ActorRel(NonMatching, "d_a_obj_scannon_crs"),
ActorRel(NonMatching, "d_a_obj_scannon_ten"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_scannon"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_scannon_crs"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_scannon_ten"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_sekidoor"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_sekizo"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_sekizoa"),
include/JSystem/J3DGraphBase/J3DPacket.h
+23
View File
@@ -32,6 +32,29 @@ enum J3DDiffFlag {
J3DDiffFlag_Changed = 0x80000000,
};
#define J3D_DIFF_LIGHTOBJNUM(n) ((n & 0xF) << 4)
#define J3D_DIFF_TEXGENNUM(n) ((n & 0xF) << 8)
#define J3D_DIFF_TEXNONUM(n) ((n & 0xF) << 16)
#define J3D_DIFF_TEVSTAGENUM(n) ((n & 0xF) << 20)
#define J3D_DIFF_FLAG(MatColor, ColorChan, AmbColor, LightNum, TexGenNum, TexGen, TexCoordNum, TevStageNum, TevReg, KColor, TexCoordScale, TevStageInd, Fog, Blend) \
( \
(MatColor << 0) | \
(ColorChan << 1) | \
(AmbColor << 2) | \
((LightNum & 0xF) << 4) | \
((TexGenNum & 0xF) << 8) | \
(TexGen << 12) | \
((TexCoordNum & 0xF) << 16) | \
((TevStageNum & 0xF) << 20) | \
(TevReg << 24) | \
(KColor << 25) | \
(TexCoordScale << 26) | \
(TevStageInd << 27) | \
(Fog << 28) | \
(Blend << 29) \
)
inline u32 getDiffFlag_LightObjNum(u32 diffFlags) {
return (diffFlags & 0xf0) >> 4;
}
include/JSystem/JKernel/JKRHeap.h
+1 -1
View File
@@ -90,7 +90,7 @@ public:
void setDebugFill(bool debugFill) { mDebugFill = debugFill; }
bool getDebugFill() const { return mDebugFill; }
void* getStartAddr() const { return (void*)mStart; }
void* getStartAddr() { return (void*)mStart; }
void* getEndAddr() const { return (void*)mEnd; }
u32 getSize() const { return mSize; }
bool getErrorFlag() const { return mErrorFlag; }
include/d/actor/d_a_npc_cdn3.h
+3 -3
View File
@@ -292,11 +292,11 @@ public:
int chkEvent() {
attention_info.flags = 0;
if (mFlowNodeNum > 0) {
attention_info.flags = 0xa;
attention_info.flags = fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_TALK_e;
}
if (mIsDarkWorld) {
if (daPy_py_c::checkNowWolfEyeUp()) {
attention_info.flags |= 0xc00000;
attention_info.flags |= (fopAc_AttnFlag_UNK_0x800000 | fopAc_AttnFlag_UNK_0x400000);
} else {
attention_info.flags = 0;
}
@@ -314,7 +314,7 @@ public:
}
int orderEvent() {
if ((!mIsDarkWorld || daPy_py_c::checkNowWolfEyeUp()) && mFlowNodeNum > 0 && ((attention_info.flags & 8) || (attention_info.flags & 2))) {
if ((!mIsDarkWorld || daPy_py_c::checkNowWolfEyeUp()) && mFlowNodeNum > 0 && ((attention_info.flags & fopAc_AttnFlag_SPEAK_e) || (attention_info.flags & fopAc_AttnFlag_TALK_e))) {
eventInfo.onCondition(dEvtCnd_CANTALK_e);
}
return 1;
include/d/actor/d_a_npc_ks.h
+1 -1
View File
@@ -200,7 +200,7 @@ public:
/* 0xC1C */ u8 field_0xc1c;
u32 fopAcM_checkHawkCarryNow(fopAc_ac_c* param_1) {
return fopAcM_checkStatus(param_1, 0x80000000);
return fopAcM_CheckStatus(param_1, 0x80000000);
}
};
include/d/actor/d_a_obj_kago.h
+1 -1
View File
@@ -72,7 +72,7 @@ public:
}
u32 fopAcM_checkHawkCarryNow(fopAc_ac_c* actor) {
return fopAcM_checkStatus(actor, 0x80000000);
return fopAcM_CheckStatus(actor, 0x80000000);
}
void popup(f32 param_1, f32 param_2, cXyz* param_3) {
include/d/actor/d_a_obj_scannon.h
+64 -14
View File
@@ -11,17 +11,37 @@
* @details
*
*/
class daSCannon_c : public fopAc_ac_c {
class daSCannon_c : public fopAc_ac_c, public request_of_phase_process_class {
public:
struct demoTable_s {
/* 0x0 */ void (daSCannon_c::*(*demo_proc_table)[2])();
/* 0x4 */ char** cut_table;
/* 0x8 */ int cut_num;
};
enum daSCannon_exeMode {
MODE_WAIT,
MODE_ORDER_EVT,
MODE_ACTION_EVT,
MODE_END,
};
enum daSCannon_demoType {
DEMOTYPE_WARP_END,
DEMOTYPE_FIRE_FIRST,
DEMOTYPE_FIRE_TKS,
DEMOTYPE_FIRE_SECOND,
};
/* 80CC6B0C */ daSCannon_c();
/* 80CC6C10 */ ~daSCannon_c();
/* 80CC6D10 */ void create();
/* 80CC7204 */ void execute();
/* 80CC7228 */ void draw();
/* 80CC747C */ void Delete();
/* 80CC6C10 */ virtual ~daSCannon_c();
/* 80CC6D10 */ int create();
/* 80CC7204 */ int execute();
/* 80CC7228 */ int draw();
/* 80CC747C */ int Delete();
/* 80CC7508 */ void setModelMtx();
/* 80CC7578 */ void setPtlModelMtx();
/* 80CC7608 */ void createHeap();
/* 80CC7608 */ int createHeap();
/* 80CC7970 */ void middleExe();
/* 80CC7A10 */ void orderEvtInit();
/* 80CC7AB8 */ void exeModeWait();
@@ -53,15 +73,45 @@ public:
/* 80CC8DA0 */ void delEmtAll();
/* 80CC8DDC */ void setCannonRepair();
static void* const s_demoTable[12];
static u8 s_exeProc[48];
static u8 s_demoExeProc_WarpEnd[48];
static u8 s_demoExeProc_FireTks[72];
static u8 s_demoExeProc_FireFirst[24];
static u8 s_demoExeProc_FireSecond[96];
int getSw1() { return fopAcM_GetParamBit(this, 0, 8); }
int getSw2() { return fopAcM_GetParamBit(this, 8, 8); }
static const demoTable_s s_demoTable[];
static void (daSCannon_c::*s_exeProc[])();
static void (daSCannon_c::*s_demoExeProc_WarpEnd[][2])();
static void (daSCannon_c::*s_demoExeProc_FireTks[][2])();
static void (daSCannon_c::*s_demoExeProc_FireFirst[][2])();
static void (daSCannon_c::*s_demoExeProc_FireSecond[][2])();
private:
/* 0x568 */ u8 field_0x568[0x638 - 0x568];
/* 0x574 */ request_of_phase_process_class mZevPhase;
/* 0x57C */ request_of_phase_process_class mPtlPhase;
/* 0x584 */ mDoExt_bckAnm mBck;
/* 0x5A0 */ cBgS_PolyInfo mGroundPoly;
/* 0x5B0 */ Mtx mBgMtx;
/* 0x5E0 */ dBgW* mpBgW;
/* 0x5E4 */ J3DModel* mpModels[2];
/* 0x5EC */ J3DModel* mpPtlModel;
/* 0x5F0 */ mDoExt_btkAnm* mpCrashBtk;
/* 0x5F4 */ mDoExt_btkAnm* mpPtlBtk;
/* 0x5F8 */ f32 mGroundY;
/* 0x5FC */ u32 mShadowKey;
/* 0x600 */ int mTimer;
/* 0x604 */ int mStaffId;
/* 0x608 */ int mDemoFinishTimer;
/* 0x60C */ int mLayerNo;
/* 0x610 */ s16 mEvtIdx;
/* 0x612 */ u16 mHeadJointNo;
/* 0x614 */ u16 mCrashJointNo;
/* 0x616 */ u8 mMode;
/* 0x617 */ u8 mIsRepaired;
/* 0x618 */ u8 mDemoType;
/* 0x619 */ u8 field_0x619;
/* 0x61A */ u8 mIsPortal;
/* 0x61B */ u8 mDrawShadow;
/* 0x61C */ JPABaseEmitter* mpEmtApp[3];
/* 0x628 */ JPABaseEmitter* mpEmtSmk[3];
/* 0x634 */ JPABaseEmitter* mpEmtLine;
};
STATIC_ASSERT(sizeof(daSCannon_c) == 0x638);
include/d/actor/d_a_obj_scannon_crs.h
+43 -10
View File
@@ -12,14 +12,23 @@
* @details
*
*/
class daSCannonCrs_c : public fopAc_ac_c {
class daSCannonCrs_c : public fopAc_ac_c, public request_of_phase_process_class {
public:
enum daSCannonCrs_exeMode {
MODE_WAIT,
MODE_PRE_WAIT,
MODE_ORDER_EVT,
MODE_TALK_EVT,
MODE_WARP_EVT,
MODE_END,
};
/* 80CC973C */ daSCannonCrs_c();
/* 80CC983C */ ~daSCannonCrs_c();
/* 80CC9910 */ void create();
/* 80CC9B10 */ void Delete();
/* 80CC9B80 */ void draw();
/* 80CC9C64 */ void execute();
/* 80CC983C */ virtual ~daSCannonCrs_c();
/* 80CC9910 */ int create();
/* 80CC9B10 */ int Delete();
/* 80CC9B80 */ int draw();
/* 80CC9C64 */ int execute();
/* 80CC9CA4 */ void middleExe(daMidna_c*);
/* 80CC9D60 */ void exeModeWait(daMidna_c*);
/* 80CC9F34 */ void exeModePreWait(daMidna_c*);
@@ -30,15 +39,39 @@ public:
/* 80CCA348 */ void demoExe();
/* 80CCA74C */ void init();
/* 80CCA848 */ void setModelMtx();
/* 80CCA8CC */ void createHeap();
/* 80CCAAC4 */ void chkInTalkRange();
/* 80CCA8CC */ int createHeap();
/* 80CCAAC4 */ bool chkInTalkRange();
/* 80CCAB24 */ void initEmtRt(u16, int, u16 const*, JPABaseEmitter**);
/* 80CCAC48 */ void exeEmtRt(u16, int, JPABaseEmitter**);
/* 80CCACD0 */ void callMidnaBeamEmt();
static u8 s_exeProc[72];
int getTalkRange() { return fopAcM_GetParamBit(this, 0, 8); }
int getWarpId() { return fopAcM_GetParamBit(this, 8, 8); }
u16 getMsgId() { return home.angle.x; }
static void (daSCannonCrs_c::*s_exeProc[])(daMidna_c*);
private:
/* 0x568 */ u8 field_0x568[0x674 - 0x568];
/* 0x574 */ cXyz mPortalWaitPos;
/* 0x580 */ dMsgFlow_c mMsgFlow;
/* 0x5CC */ mDoExt_bckAnm mBck;
/* 0x5E8 */ mDoExt_btkAnm mBtk;
/* 0x600 */ J3DModel* mpModel;
/* 0x604 */ dBgW* mpBgW;
/* 0x608 */ Mtx mBgMtx;
/* 0x638 */ f32 mTalkRangeSqDist;
/* 0x63C */ int mStaffId;
/* 0x640 */ int mWarpQuakeTimer;
/* 0x644 */ int mVoiceTimer;
/* 0x648 */ u16 mEffectJointNo;
/* 0x64A */ u16 mCenterJointNo;
/* 0x64C */ s16 mEvtIdx;
/* 0x64E */ u8 mMode;
/* 0x64F */ u8 field_0x64F[0x651 - 0x64F];
/* 0x651 */ u8 field_0x651;
/* 0x652 */ u8 field_0x652;
/* 0x654 */ JPABaseEmitter* mpDisapEmt[4];
/* 0x664 */ JPABaseEmitter* mpBeamEmt[4];
};
STATIC_ASSERT(sizeof(daSCannonCrs_c) == 0x674);
include/d/actor/d_a_obj_scannon_ten.h
+31 -10
View File
@@ -11,15 +11,22 @@
* @details
*
*/
class daObjSCannonTen_c : public fopAc_ac_c {
class daObjSCannonTen_c : public fopAc_ac_c, public request_of_phase_process_class {
public:
enum daSCannonTen_exeMode {
MODE_WAIT,
MODE_ORDER_EVT,
MODE_ACTION_EVT,
MODE_END,
};
/* 80CCB364 */ daObjSCannonTen_c();
/* 80CCB43C */ ~daObjSCannonTen_c();
/* 80CCB4EC */ void createHeap();
/* 80CCB66C */ void create();
/* 80CCB9E0 */ void Delete();
/* 80CCBA58 */ void draw();
/* 80CCBB6C */ void execute();
/* 80CCB43C */ virtual ~daObjSCannonTen_c();
/* 80CCB4EC */ int createHeap();
/* 80CCB66C */ int create();
/* 80CCB9E0 */ int Delete();
/* 80CCBA58 */ int draw();
/* 80CCBB6C */ int execute();
/* 80CCBB90 */ void middleExe();
/* 80CCBC08 */ void exeModeWait();
/* 80CCBCB0 */ void exeModeOrderEvt();
@@ -48,11 +55,25 @@ public:
/* 80CCC8B8 */ void exeEmtLine();
/* 80CCC97C */ void delEmtAll();
static u8 s_exeProc[48];
static u8 s_demoExeProc[144];
static void (daObjSCannonTen_c::*s_exeProc[])();
static void (daObjSCannonTen_c::*s_demoExeProc[][2])();
private:
/* 0x568 */ u8 field_0x568[0x604 - 0x568];
/* 0x574 */ J3DModel* mpModel;
/* 0x578 */ mDoExt_bckAnm mBck;
/* 0x594 */ dBgW* mpBgW;
/* 0x598 */ cBgS_PolyInfo mGroundPoly;
/* 0x5A8 */ Mtx mBgMtx;
/* 0x5D8 */ f32 mGroundY;
/* 0x5DC */ u32 mShadowKey;
/* 0x5E0 */ int mTimer;
/* 0x5E4 */ int mStaffId;
/* 0x5E8 */ u8 field_0x5E8[0x5EC - 0x5E8];
/* 0x5EC */ s16 mEvtIdx;
/* 0x5EE */ u16 mHeadJointNo;
/* 0x5F0 */ u8 mMode;
/* 0x5F4 */ JPABaseEmitter* mpEmtSmk[3];
/* 0x600 */ JPABaseEmitter* mpEmtLine;
};
STATIC_ASSERT(sizeof(daObjSCannonTen_c) == 0x604);
include/d/d_attention.h
+25 -5
View File
@@ -4,7 +4,7 @@
#include "SSystem/SComponent/c_angle.h"
#include "m_Do/m_Do_ext.h"
#include "f_pc/f_pc_base.h"
#include "JSystem/JHostIO/JORReflexible.h"
#include "m_Do/m_Do_hostIO.h"
class fopAc_ac_c;
@@ -46,7 +46,7 @@ private:
class dAttParam_c : public JORReflexible {
public:
#ifdef DEBUG
/* 0x04 */ u8 unk_0x4;
/* 0x04 */ s8 mHIOChildNo;
#endif
/* 0x00 */ u16 mFlags;
@@ -67,8 +67,8 @@ public:
/* 0x38 */ f32 field_0x38;
/* 0x3C */ f32 field_0x3c;
#ifdef DEBUG
/* 0x44 */ int unk_0x44;
/* 0x48 */ int unk_0x48;
/* 0x44 */ s32 mDebugDispPosX;
/* 0x48 */ s32 mDebugDispPosY;
#endif
public:
@@ -76,6 +76,14 @@ public:
/* 80070038 */ dAttParam_c(s32);
#ifdef DEBUG
void connectHIO(char* i_name) {
mHIOChildNo = mDoHIO_CREATE_CHILD(i_name, this);
}
void releaseHIO() {
mDoHIO_DELETE_CHILD(mHIOChildNo);
}
virtual void genMessage(JORMContext*);
#endif
/* 80070110 */ virtual ~dAttParam_c();
@@ -90,7 +98,15 @@ public:
EFlag_MARGIN_DEBUG = (1 << 15),
};
bool CheckFlag(u16 flag) { return mFlags & flag; }
bool CheckFlag(u16 flag) { return flag & mFlags ? true : false; }
f32 FreeStick() {
#if DEBUG
return mSWModeDisable;
#else
return -0.9f;
#endif
}
/* 0x40 vtable */
}; // Size: 0x44
@@ -229,6 +245,10 @@ public:
/* 80182AD0 */ void keepLock(int timer) { mAttnBlockTimer = timer; }
/* 8014B010 */ static dist_entry& getDistTable(int i_no) { return dist_table[i_no]; }
#if DEBUG
void runDebugDisp0();
#endif
fopAc_ac_c* getCatghTarget() { return mCatghTarget.getCatghTarget(); }
fopAc_ac_c* getZHintTarget() { return mZHintTarget.getZHintTarget(); }
u8 getCatchChgItem() { return mCatghTarget.getChangeItem(); }
include/d/d_save.h
+5 -1
View File
@@ -879,9 +879,13 @@ public:
dSv_player_c& getPlayer() { return mPlayer; }
dSv_event_c& getEvent() { return mEvent; }
dSv_memory_c& getSave(int i_stageNo) { return mSave[i_stageNo]; }
dSv_MiniGame_c& getMiniGame() { return mMiniGame; }
dSv_memory_c& getSave(int i_stageNo) {
JUT_ASSERT(1412, 0 <= i_stageNo && i_stageNo < STAGE_MAX);
return mSave[i_stageNo];
}
void putSave(int i_stageNo, dSv_memory_c mem) {
JUT_ASSERT(1417, 0 <= i_stageNo && i_stageNo < dSv_save_c::STAGE_MAX);
mSave[i_stageNo] = mem;
include/d/d_stage.h
+1
View File
@@ -1273,6 +1273,7 @@ void dStage_dt_c_roomLoader(void* i_data, dStage_dt_c* stageDt, int param_2);
dStage_KeepDoorInfo* dStage_GetKeepDoorInfo();
dStage_KeepDoorInfo* dStage_GetRoomKeepDoorInfo();
void dStage_dt_c_fieldMapLoader(void* i_data, dStage_dt_c* i_stage);
const char* dStage_getName(s16 procName, s8 subtype);
#if VERSION == VERSION_WII_USA_R0
void dStage_escapeRestart();
include/f_op/f_op_actor.h
+41 -6
View File
@@ -92,14 +92,54 @@ enum fopAc_attention_type {
fopAc_attn_LOCK_e,
fopAc_attn_TALK_e,
fopAc_attn_BATTLE_e,
#if !PLATFORM_GCN
fopAc_attn_UNK_3,
fopAc_attn_UNK_4,
fopAc_attn_UNK_5,
#endif
fopAc_attn_SPEAK_e,
fopAc_attn_CARRY_e,
fopAc_attn_DOOR_e,
fopAc_attn_JUEL_e,
#if !PLATFORM_GCN
fopAc_attn_UNK_10,
#endif
fopAc_attn_ETC_e,
fopAc_attn_CHECK_e,
fopAc_attn_MAX_e,
};
enum fopAc_AttentionFlag_e {
fopAc_AttnFlag_LOCK_e = (1 << fopAc_attn_LOCK_e),
fopAc_AttnFlag_TALK_e = (1 << fopAc_attn_TALK_e),
fopAc_AttnFlag_BATTLE_e = (1 << fopAc_attn_BATTLE_e),
fopAc_AttnFlag_SPEAK_e = (1 << fopAc_attn_SPEAK_e),
fopAc_AttnFlag_CARRY_e = (1 << fopAc_attn_CARRY_e),
fopAc_AttnFlag_DOOR_e = (1 << fopAc_attn_DOOR_e),
fopAc_AttnFlag_JUEL_e = (1 << fopAc_attn_JUEL_e),
fopAc_AttnFlag_ETC_e = (1 << fopAc_attn_ETC_e),
fopAc_AttnFlag_CHECK_e = (1 << fopAc_attn_CHECK_e),
fopAc_AttnFlag_UNK_0x200000 = 0x200000,
fopAc_AttnFlag_UNK_0x400000 = 0x400000,
fopAc_AttnFlag_UNK_0x800000 = 0x800000,
fopAc_AttnFlag_NOTALK_e = 0x2000000,
fopAc_AttnFlag_ENEMY_NOLOCK_e = 0x4000000,
fopAc_AttnFlag_UNK_0x8000000 = 0x8000000,
fopAc_AttnFlag_TALKCHECK_e = 0x20000000,
fopAc_AttnFlag_TALKREAD_e = 0x40000000,
};
#define fopAc_AttnFlags_LOCK (fopAc_AttnFlag_LOCK_e | fopAc_AttnFlag_TALK_e | fopAc_AttnFlag_BATTLE_e)
#define fopAc_AttnFlags_ACTION (fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_CARRY_e | fopAc_AttnFlag_DOOR_e | fopAc_AttnFlag_JUEL_e | fopAc_AttnFlag_ETC_e)
class JKRSolidHeap;
enum dEvt_Command_e {
@@ -175,12 +215,7 @@ struct actor_place {
};
struct actor_attention_types {
/* 0x00 */ u8 distances[9];
#if VERSION > VERSION_GCN_JPN
u8 unk_0x9[4];
#endif
/* 0x00 */ u8 distances[fopAc_attn_MAX_e];
/* 0x0A */ s16 field_0xa;
/* 0x0C */ cXyz position;
/* 0x18 */ u32 flags;
include/f_op/f_op_actor_mng.h
+3 -3
View File
@@ -161,7 +161,7 @@ inline MtxP fopAcM_GetMtx(const fopAc_ac_c* i_actor) {
return i_actor->cullMtx;
}
inline u32 fopAcM_checkStatus(fopAc_ac_c* i_actor, u32 actor_status) {
inline u32 fopAcM_CheckStatus(fopAc_ac_c* i_actor, u32 actor_status) {
return i_actor->actor_status & actor_status;
}
@@ -186,7 +186,7 @@ inline u32 fopAcM_CheckCarryType(const fopAc_ac_c* actor, fopAcM_CARRY type) {
}
inline u32 fopAcM_checkHookCarryNow(fopAc_ac_c* i_actor) {
return fopAcM_checkStatus(i_actor, fopAcM_STATUS_HOOK_CARRY_NOW);
return fopAcM_CheckStatus(i_actor, fopAcM_STATUS_HOOK_CARRY_NOW);
}
inline u32 fopAcM_GetParam(const void* i_actor) {
@@ -818,7 +818,7 @@ inline void fopAcM_setWarningMessage_f(const fopAc_ac_c* i_actor, const char* i_
#define fopAcM_setWarningMessage(...)
#endif
void fopAcM_getNameString(fopAc_ac_c*, char*);
void fopAcM_getNameString(const fopAc_ac_c*, char*);
class fopAcM_lc_c {
public:
src/d/actor/d_a_L7op_demo_dr.cpp
+1 -1
View File
@@ -833,7 +833,7 @@ int daL7ODR_c::create() {
scale.setall(1.0f);
attention_info.distances[fopAc_attn_BATTLE_e] = 0;
attention_info.flags &= ~0x4;
attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e;
fopAcM_SetGroup(this, 0);
fopAcM_OffStatus(this, 0);
src/d/actor/d_a_alink.cpp
+6 -6
View File
@@ -10040,21 +10040,21 @@ BOOL daAlink_c::setTalkStatus() {
if (notTalk()) {
setDoStatus(0x90);
} else {
if (field_0x27f4->attention_info.flags & 0x2000000) {
if (field_0x27f4->attention_info.flags & fopAc_AttnFlag_NOTALK_e) {
return 0;
}
if (field_0x27f4->attention_info.flags & 0x800000) {
if (field_0x27f4->attention_info.flags & fopAc_AttnFlag_UNK_0x800000) {
setDoStatus(0x3B);
} else if (field_0x27f4->attention_info.flags & 0x20000000) {
} else if (field_0x27f4->attention_info.flags & fopAc_AttnFlag_TALKCHECK_e) {
if (fopAcM_GetName(field_0x27f4) == PROC_OBJ_SSDRINK) {
setDoStatus(0x3C);
} else {
setDoStatus(8);
}
} else if (field_0x27f4->attention_info.flags & 0x40000000) {
} else if (field_0x27f4->attention_info.flags & fopAc_AttnFlag_TALKREAD_e) {
setDoStatus(0x80);
} else if (field_0x27f4->attention_info.flags & 0x8000000) {
} else if (field_0x27f4->attention_info.flags & fopAc_AttnFlag_UNK_0x8000000) {
setDoStatus(0x1B);
} else {
setDoStatus(0x1C);
@@ -17849,7 +17849,7 @@ int daAlink_c::execute() {
mProcID == PROC_WOLF_GET_SMELL || mProcID == PROC_WOLF_DIG ||
mProcID == PROC_WOLF_DIG_THROUGH || checkNoResetFlg0(FLG0_UNK_4000) ||
dComIfGp_checkPlayerStatus1(0, 0x1000000) ||
(checkEventRun() && partner != NULL && (partner->attention_info.flags & 0x400000)) ||
(checkEventRun() && partner != NULL && (partner->attention_info.flags & fopAc_AttnFlag_UNK_0x400000)) ||
!strcmp(dComIfGp_getEventManager().getRunEventName(), l_defaultGetEventName))
{
mWolfEyeUp = daAlinkHIO_wolf_c0::m.mSensesLingerTime;
src/d/actor/d_a_alink_grab.inc
+1 -1
View File
@@ -531,7 +531,7 @@ BOOL daAlink_c::checkNextActionGrab() {
setCarryArmAngle(0.0f, 1.0f);
if (mTargetedActor == NULL && mAttList != NULL && mAttList->mType == 5 && fopAcM_checkStatus(temp_r3, 0x2000000)) {
if (mTargetedActor == NULL && mAttList != NULL && mAttList->mType == 5 && fopAcM_CheckStatus(temp_r3, 0x2000000)) {
setDoStatus(6);
} else if ((field_0x27f4 == NULL) || !checkGrabTalkActor(field_0x27f4) || !setTalkStatus()) {
if (checkModeFlg(0x400)) {
src/d/actor/d_a_alink_guard.inc
+1 -1
View File
@@ -31,7 +31,7 @@ BOOL daAlink_c::checkSpecialNpc(fopAc_ac_c* i_actor) {
/* 800DC5DC-800DC678 0D6F1C 009C+00 1/1 0/0 0/0 .text checkShieldAttackEmphasys__9daAlink_cFv */
BOOL daAlink_c::checkShieldAttackEmphasys() {
return mTargetedActor != NULL && (mTargetedActor->attention_info.flags & 0x200000) &&
return mTargetedActor != NULL && (mTargetedActor->attention_info.flags & fopAc_AttnFlag_UNK_0x200000) &&
!checkCutHeadState() &&
(fopAcM_GetGroup(mTargetedActor) != fopAc_ENEMY_e ||
!static_cast<fopEn_enemy_c*>(mTargetedActor)->checkDownFlg());
src/d/actor/d_a_alink_hook.inc
+1 -1
View File
@@ -221,7 +221,7 @@ void daAlink_c::hookshotAtHitCallBack(dCcD_GObjInf* i_atObjInf, fopAc_ac_c* i_tg
mSearchBallScale = dist_to_hitpos;
if (checkHookshotWait()) {
if (fopAcM_checkStatus(i_tgActor, 0x280000)) {
if (fopAcM_CheckStatus(i_tgActor, 0x280000)) {
mHookTargetAcKeep.setData(i_tgActor);
} else {
field_0x3494 = 1.0f;
src/d/actor/d_a_alink_wolf.inc
+3 -3
View File
@@ -6184,7 +6184,7 @@ BOOL daAlink_c::checkMidnaDisappearMode() const {
return mProcID == PROC_WOLF_DIG_THROUGH ||
(checkWolf() && dComIfGp_checkPlayerStatus0(0, 0x8000000) &&
!dComIfGp_checkPlayerStatus0(0, 0x10) &&
(mTargetedActor == NULL || !(mTargetedActor->attention_info.flags & 0x800000)));
(mTargetedActor == NULL || !(mTargetedActor->attention_info.flags & fopAc_AttnFlag_UNK_0x800000)));
}
/* 801371FC-801372B4 131B3C 00B8+00 3/3 0/0 0/0 .text checkWolfLieContinue__9daAlink_cFi
@@ -6193,7 +6193,7 @@ BOOL daAlink_c::checkWolfLieContinue(int param_0) {
cM3dGPla slide_poly;
if ((param_0 ||
((mTargetedActor != NULL && (mTargetedActor->attention_info.flags & 0x800000)) &&
((mTargetedActor != NULL && (mTargetedActor->attention_info.flags & fopAc_AttnFlag_UNK_0x800000)) &&
(fopAcM_GetName(mTargetedActor) == PROC_NPC_JAGAR ||
fopAcM_GetName(mTargetedActor) == PROC_NPC_BOU))) &&
!getSlidePolygon(&slide_poly) && !checkWolfLieWaterIn())
@@ -7087,7 +7087,7 @@ void daAlink_c::searchWolfLockEnemy(fopAc_ac_c* i_actor, void* i_data) {
}
fopEn_enemy_c* enemy_p = static_cast<fopEn_enemy_c*>(i_actor);
if (fopAcM_GetGroup(enemy_p) == 2 && enemy_p->attention_info.flags & 5 &&
if (fopAcM_GetGroup(enemy_p) == 2 && enemy_p->attention_info.flags & (fopAc_AttnFlag_BATTLE_e | fopAc_AttnFlag_LOCK_e) &&
!enemy_p->checkWolfNoLock())
{
f32 dist_to_enemy = current.pos.abs2(enemy_p->eyePos);
src/d/actor/d_a_arrow.cpp
+1 -1
View File
@@ -1010,7 +1010,7 @@ int daArrow_c::procSlingHitInit(cXyz* param_0, dCcD_GObjInf* param_1) {
if (!daAlink_c::notSwordHitVibActor(hit_ac)) {
u16 hitmark;
if (hit_ac != NULL && fopAcM_checkStatus(hit_ac, 0x10000) != 0) {
if (hit_ac != NULL && fopAcM_CheckStatus(hit_ac, 0x10000) != 0) {
hitmark = 1;
} else {
hitmark = 9;
src/d/actor/d_a_b_bh.cpp
+2 -2
View File
@@ -1157,7 +1157,7 @@ static void action(b_bh_class* i_this) {
if (spC != 0) {
fopAcM_OnStatus(a_this, 0);
a_this->attention_info.flags = 4;
a_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
} else {
fopAcM_OffStatus(a_this, 0);
a_this->attention_info.flags = 0;
@@ -1524,7 +1524,7 @@ static int daB_BH_Create(fopAc_ac_c* i_this) {
l_HIO.no = mDoHIO_CREATE_CHILD("ボスババ触手", &l_HIO);
}
i_this->attention_info.flags = 4;
i_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
i_this->health = 1;
i_this->field_0x560 = 1;
src/d/actor/d_a_b_bq.cpp
+1 -1
View File
@@ -2523,7 +2523,7 @@ static int daB_BQ_Create(fopAc_ac_c* i_this) {
l_HIO.field_0x4 = -1;
}
a_this->attention_info.flags = 4;
a_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
a_this->attention_info.distances[fopAc_attn_BATTLE_e] = 0x16;
static dCcD_SrcSph cc_sph_src = {
src/d/actor/d_a_b_dr.cpp
+11 -11
View File
@@ -542,13 +542,13 @@ void daB_DR_c::mStatusONOFF(int i_status) {
switch (i_status) {
case 0:
attention_info.distances[fopAc_attn_BATTLE_e] = 0;
attention_info.flags &= ~4;
attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e;
fopAcM_OffStatus(this, 0);
fopAcM_OffStatus(this, 0x200000);
return;
case 1:
attention_info.distances[fopAc_attn_BATTLE_e] = 85;
attention_info.flags |= 4;
attention_info.flags |= fopAc_AttnFlag_BATTLE_e;
fopAcM_OnStatus(this, 0);
fopAcM_OnStatus(this, 0x200000);
return;
@@ -556,7 +556,7 @@ void daB_DR_c::mStatusONOFF(int i_status) {
attention_info.distances[fopAc_attn_BATTLE_e] = 60;
fopAcM_OnStatus(this, 0);
fopAcM_OffStatus(this, 0x200000);
attention_info.flags |= 4;
attention_info.flags |= fopAc_AttnFlag_BATTLE_e;
return;
}
}
@@ -1012,7 +1012,7 @@ void daB_DR_c::tail_hit_check() {
if (health > 0) {
daPy_getPlayerActorClass()->onBossRoomWait();
if (fopAcM_checkStatus(this, 0x200000) && cLib_calcTimer<u8>(&field_0x7d0) == 0 && mActionMode != ACTION_TAIL_HIT && field_0x7d1 != 2) {
if (fopAcM_CheckStatus(this, 0x200000) && cLib_calcTimer<u8>(&field_0x7d0) == 0 && mActionMode != ACTION_TAIL_HIT && field_0x7d1 != 2) {
if (mTailCc.ChkTgHit()) {
speedF = 0.0f;
dComIfGs_onZoneSwitch(21, fopAcM_GetRoomNo(this));
@@ -1029,7 +1029,7 @@ void daB_DR_c::week_hit_check() {
if (mWeekCc.ChkTgSet()) {
daPy_getPlayerActorClass()->onBossRoomWait();
if (health > 0 && fopAcM_checkStatus(this, 0x200000) && cLib_calcTimer<u8>(&field_0x7d0) == 0 && mActionMode != ACTION_WEEK_HIT && field_0x7d1 == 2) {
if (health > 0 && fopAcM_CheckStatus(this, 0x200000) && cLib_calcTimer<u8>(&field_0x7d0) == 0 && mActionMode != ACTION_WEEK_HIT && field_0x7d1 == 2) {
if (mWeekCc.ChkTgHit() && mWeekCc.GetTgHitObj()->ChkAtType(AT_TYPE_HOOKSHOT)) {
speedF = 0.0f;
Z2GetAudioMgr()->changeBgmStatus(2);
@@ -2370,18 +2370,18 @@ void daB_DR_c::executeBreathAttack() {
mTimer[3] = 1000;
}
attention_info.flags |= 4;
attention_info.flags |= fopAc_AttnFlag_BATTLE_e;
if (cLib_calcTimer<int>(&mTimer[3]) != 0 && mTargetHeight - 300.0f < player->current.pos.y) {
if (abs((s16)(fopAcM_searchPlayerAngleY(this) - shape_angle.y)) < ZREG_S(0) + 0x5000) {
mWeekCc.OffTgSetBit();
attention_info.flags &= ~0x4;
attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e;
} else {
mWeekCc.OnTgSetBit();
if (mTarget != 0 || (dComIfGp_getAttention()->GetLockonList(0) != NULL && dComIfGp_getAttention()->LockonTruth() && dComIfGp_getAttention()->GetLockonList(0)->getActor() == this)) {
mTarget = 0;
} else {
attention_info.flags &= ~0x4;
attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e;
mTarget = 0;
}
}
@@ -2798,7 +2798,7 @@ void daB_DR_c::executeGliderAttack() {
if (mGliderMoveSub(field_0x748) != 0) {
mStatusONOFF(0);
attention_info.distances[fopAc_attn_BATTLE_e] = 0;
attention_info.flags &= ~0x4;
attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e;
fopAcM_OffStatus(this, 0);
mCount[2] = 0;
@@ -4128,7 +4128,7 @@ int daB_DR_c::create() {
OS_REPORT("パーツ %d\n", mPartNo);
case 10:
attention_info.distances[fopAc_attn_BATTLE_e] = 0;
attention_info.flags &= ~0x4;
attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e;
fopAcM_SetGroup(this, 0);
fopAcM_OffStatus(this, 0);
@@ -4224,7 +4224,7 @@ int daB_DR_c::create() {
shape_angle.y = current.angle.y;
attention_info.distances[fopAc_attn_BATTLE_e] = 85;
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
fopAcM_SetMtx(this, mpModelMorf->getModel()->getBaseTRMtx());
fopAcM_SetMin(this, -20000.0f, -20000.0f, -20000.0f);
src/d/actor/d_a_b_ds.cpp
+8 -8
View File
@@ -1707,7 +1707,7 @@ void daB_DS_c::executeOpeningDemo() {
dComIfGp_event_reset();
attention_info.distances[fopAc_attn_BATTLE_e] = 0;
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
fopAcM_SetGroup(this, 2);
fopAcM_OnStatus(this, 0);
@@ -2863,7 +2863,7 @@ void daB_DS_c::executeBattle2OpeningDemo() {
dComIfGs_setRestartRoom(vec, -0x664A, 50);
attention_info.distances[fopAc_attn_BATTLE_e] = 0;
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
fopAcM_SetGroup(this, 2);
Z2GetAudioMgr()->bgmStart(Z2BGM_HARAGIGANT_BTL02, 0, 0);
@@ -5376,7 +5376,7 @@ int daB_DS_c::CreateHeap() {
current.pos.set(0.0f, 1900.0f, 0.0f);
attention_info.distances[fopAc_attn_BATTLE_e] = 0;
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
fopAcM_SetGroup(this, 2);
fopAcM_OnStatus(this, 0);
@@ -5562,7 +5562,7 @@ cPhs__Step daB_DS_c::create() {
if (arg0 == TYPE_BULLET_A || arg0 == TYPE_BULLET_B || arg0 == TYPE_BULLET_C) {
attention_info.distances[fopAc_attn_BATTLE_e] = 0;
attention_info.flags &= ~4;
attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e;
fopAcM_SetGroup(this, 0);
fopAcM_OffStatus(this, 0);
@@ -5573,7 +5573,7 @@ cPhs__Step daB_DS_c::create() {
mBreathAtSph.SetStts(&mCcStts);
fopAcM_OffStatus(this, 0);
attention_info.flags &= ~4;
attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e;
if (arg0 == TYPE_BULLET_B || arg0 == TYPE_BULLET_C) {
mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1,
@@ -5605,7 +5605,7 @@ cPhs__Step daB_DS_c::create() {
shape_angle.y = current.angle.y;
attention_info.distances[fopAc_attn_BATTLE_e] = 0;
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
fopAcM_SetMtx(this, mpMorf->mpModel->getBaseTRMtx());
fopAcM_SetMin(this, -40000.0f, -40000.0f, -40000.0f);
@@ -5707,7 +5707,7 @@ cPhs__Step daB_DS_c::create() {
}
attention_info.distances[fopAc_attn_BATTLE_e] = 0;
attention_info.flags &= ~4;
attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e;
fopAcM_SetGroup(this, 0);
fopAcM_OffStatus(this, 0);
@@ -5740,7 +5740,7 @@ cPhs__Step daB_DS_c::create() {
gravity = -1.0f;
attention_info.distances[fopAc_attn_BATTLE_e] = 0;
attention_info.flags &= ~4;
attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e;
fopAcM_SetGroup(this, 0);
fopAcM_OffStatus(this, 0);
src/d/actor/d_a_b_gg.cpp
+4 -4
View File
@@ -2177,11 +2177,11 @@ void daB_GG_c::AttentionChk() {
daPy_getPlayerActorClass();
if (s_dis < 3000.0f) {
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
if (field_0x5b0 != 0 && mSubAction == SUBACT_ATTACK) {
s16 temp_r0 = fopAcM_toPlayerShapeAngleY(this) + 0x8000;
if (temp_r0 < 0x3000 && temp_r0 > -0x3000) {
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
} else {
attention_info.flags = 0;
}
@@ -3421,7 +3421,7 @@ void daB_GG_c::GroundAction() {
/* 805E8EE8-805E92A0 00ABC8 03B8+00 1/1 0/0 0/0 .text StopAction__8daB_GG_cFv */
void daB_GG_c::StopAction() {
if (!other_bg_check(this, daPy_getPlayerActorClass())) {
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
} else {
attention_info.flags = 0;
}
@@ -4384,7 +4384,7 @@ int daB_GG_c::Create() {
gravity = 0.0f;
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
attention_info.distances[fopAc_attn_BATTLE_e] = 82;
fopAcM_SetMtx(this, mpModelMorf->getModel()->getBaseTRMtx());
src/d/actor/d_a_b_gnd.cpp
+1 -1
View File
@@ -2595,7 +2595,7 @@ static void action(b_gnd_class* i_this) {
if (attn_on) {
fopAcM_OnStatus(i_this, 0);
i_this->attention_info.flags = 4;
i_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
} else {
fopAcM_OffStatus(i_this, 0);
i_this->attention_info.flags = 0;
src/d/actor/d_a_b_go.cpp
+1 -1
View File
@@ -261,7 +261,7 @@ static int daB_GO_Create(fopAc_ac_c* i_this) {
l_HIO.field_0x4 = -1;
}
a_this->attention_info.flags = 4;
a_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
fopAcM_SetMtx(a_this, a_this->mpMorf->getModel()->getBaseTRMtx());
fopAcM_SetMin(a_this, -500.0f, -2000.0f, -500.0f);
fopAcM_SetMax(a_this, 500.0f, 2000.0f, 500.0f);
src/d/actor/d_a_b_gos.cpp
+1 -1
View File
@@ -385,7 +385,7 @@ static int daB_GOS_Create(fopAc_ac_c* i_this) {
l_HIO.field_0x4 = -1;
}
a_this->attention_info.flags = 4;
a_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
fopAcM_SetMtx(a_this, a_this->mpMorf->getModel()->getBaseTRMtx());
fopAcM_SetMin(a_this, -200.0f, -200.0f, -200.0f);
fopAcM_SetMax(a_this, 200.0f, 200.0f, 200.0f);
src/d/actor/d_a_b_mgn.cpp
+8 -8
View File
@@ -1450,7 +1450,7 @@ void daB_MGN_c::executeDash() {
case 1:
attention_info.flags = 0;
if (player->checkNowWolf()) {
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
}
if (mpMgnModelMorf->isStop()) {
@@ -1500,7 +1500,7 @@ void daB_MGN_c::executeDash() {
attention_info.flags = 0;
if (player->checkNowWolf()) {
attention_info.flags |= 4;
attention_info.flags |= fopAc_AttnFlag_BATTLE_e;
cXyz sp48;
mDoMtx_stack_c::YrotS(-shape_angle.y);
@@ -1508,7 +1508,7 @@ void daB_MGN_c::executeDash() {
mDoMtx_stack_c::multVec(&daPy_getPlayerActorClass()->current.pos, &sp48);
if (fabsf(sp48.x) < 200.0f && sp48.z > 100.0f && sp48.z < 1500.0f) {
attention_info.flags |= 0x10;
attention_info.flags |= fopAc_AttnFlag_CARRY_e;
}
}
@@ -1832,7 +1832,7 @@ void daB_MGN_c::executeThrown() {
field_0xaa0 = 150;
field_0xb08 = 0;
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
}
break;
case 10:
@@ -1849,7 +1849,7 @@ void daB_MGN_c::executeThrown() {
mMoveMode = 11;
dCam_getBody()->ForceLockOn(this);
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
case 11:
if (mpMgnModelMorf->isStop()) {
attention_info.flags = 0;
@@ -1887,7 +1887,7 @@ void daB_MGN_c::executeDown() {
switch (mMoveMode) {
case 0:
case 1:
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
field_0x20f4[0].OffTgSetBit();
mAtSph.OffAtSetBit();
field_0xafd = 1;
@@ -1958,7 +1958,7 @@ void daB_MGN_c::executeDown() {
}
field_0xb08 = 0;
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
field_0x20f4[0].OnTgSetBit();
field_0x20f4[1].OnTgSetBit();
@@ -2453,7 +2453,7 @@ void daB_MGN_c::executeFall() {
attention_info.flags = 0;
if (daPy_py_c::checkNowWolf()) {
attention_info.flags |= 4;
attention_info.flags |= fopAc_AttnFlag_BATTLE_e;
}
cLib_addCalcAngleS(&shape_angle.y, fopAcM_searchPlayerAngleY(this), 0x10, 0x400, 0x80);
src/d/actor/d_a_b_ob.cpp
+3 -3
View File
@@ -886,7 +886,7 @@ static void core_action(b_ob_class* i_this) {
if (attn_ON && i_this->field_0x479c > -1.0f && a_this->eyePos.y >= a_this->home.pos.y) {
fopAcM_OnStatus(a_this, 0);
a_this->attention_info.flags = 4;
a_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
} else {
fopAcM_OffStatus(a_this, 0);
a_this->attention_info.flags = 0;
@@ -939,7 +939,7 @@ static void core_action(b_ob_class* i_this) {
static void core_damage_check(b_ob_class* i_this) {
fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
if (fopAcM_checkStatus(a_this, 0x100000)) {
if (fopAcM_CheckStatus(a_this, 0x100000)) {
i_this->field_0x5d38 =
dComIfGp_particle_set(i_this->field_0x5d38, 0x8802, &a_this->current.pos, NULL, NULL);
}
@@ -1655,7 +1655,7 @@ static void fish_move(b_ob_class* i_this) {
if (attn_ON && i_this->mAttnOffTimer == 0) {
fopAcM_OnStatus(a_this, 0);
a_this->attention_info.flags = 4;
a_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
} else {
fopAcM_OffStatus(a_this, 0);
a_this->attention_info.flags = 0;
src/d/actor/d_a_b_tn.cpp
+3 -3
View File
@@ -2652,7 +2652,7 @@ void daB_TN_c::executeGuardH() {
} else {
// Obtained 4 secret techinques
if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[341])) {
attention_info.flags |= 0x200000;
attention_info.flags |= fopAc_AttnFlag_UNK_0x200000;
}
}
@@ -4530,7 +4530,7 @@ void daB_TN_c::action() {
mUpdateWaistAngle = false;
mChkCoHitOK = false;
mSphCSmallFlag = false;
attention_info.flags &= 0xffdfffff;
attention_info.flags &= ~fopAc_AttnFlag_UNK_0x200000;
int iVar1 = 1;
switch (mActionMode1) {
@@ -5169,7 +5169,7 @@ int daB_TN_c::create() {
l_HIO.mUnk1 = -1;
}
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
fopAcM_SetMtx(this, mpModelMorf2->getModel()->getBaseTRMtx());
fopAcM_SetMin(this, -200.0f, -200.0f, -200.0f);
fopAcM_SetMax(this, 200.0f, 200.0f, 200.0f);
src/d/actor/d_a_b_yo.cpp
+1 -1
View File
@@ -2803,7 +2803,7 @@ void daB_YO_c::action() {
attention_info.flags = 0;
if (mAttentionTimer != 0) {
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
}
BOOL bVar1 = TRUE;
src/d/actor/d_a_b_zant.cpp
+17 -17
View File
@@ -396,7 +396,7 @@ void daB_ZANT_c::setDamageSe(dCcD_Sph* i_hitSph, int i_dmgAmount) {
BOOL var_r29;
u8 at_se = ((dCcD_GObjInf*)mAtInfo.mpCollider)->GetAtSe();
if (mAtInfo.mpCollider->ChkAtType(AT_TYPE_HOOKSHOT) && !fopAcM_checkStatus(this, 0x280000)) {
if (mAtInfo.mpCollider->ChkAtType(AT_TYPE_HOOKSHOT) && !fopAcM_CheckStatus(this, 0x280000)) {
var_r29 = 1;
} else {
var_r29 = 0;
@@ -1035,7 +1035,7 @@ void daB_ZANT_c::executeSmallAttack() {
switch (mMode) {
case 0:
setTgHitBit(TRUE);
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
mMode = 2;
field_0x6fd = 0;
@@ -1115,7 +1115,7 @@ void daB_ZANT_c::executeSmallAttack() {
break;
case 4:
if (mpModelMorf->isStop()) {
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
if (mFightPhase == PHASE_BB) {
field_0x711 = 1;
@@ -1274,7 +1274,7 @@ void daB_ZANT_c::executeWarp() {
break;
case 6:
if (calcScale(1)) {
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
setCoHitBit(TRUE);
setBaseActionMode(0);
}
@@ -1288,7 +1288,7 @@ void daB_ZANT_c::executeDamage() {
case 0:
case 1:
case 2:
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
if (setNextDamageMode(FALSE)) {
setTgHitBit(FALSE);
@@ -1344,7 +1344,7 @@ void daB_ZANT_c::executeDamage() {
void daB_ZANT_c::executeConfuse() {
switch (mMode) {
case 0:
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
speedF = 0.0f;
speed.y = 0.0f;
mMode = 1;
@@ -1942,7 +1942,7 @@ void daB_ZANT_c::executeHook() {
setBck(BCK_ZAN_HOOK_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
}
case 3:
if (!fopAcM_checkStatus(this, 0x100000)) {
if (!fopAcM_CheckStatus(this, 0x100000)) {
setTgHitBit(TRUE);
setCoHitBit(TRUE);
setActionMode(ACT_SWIM, 10);
@@ -1966,7 +1966,7 @@ void daB_ZANT_c::executeWater() {
mMode = 0x19;
field_0x6f0 = 0x78;
field_0x705 = 1;
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
setBck(BCK_ZAN_FLOAT_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
} else if (field_0x705 != 0) {
if (((daB_ZANTZ_c*)pmobile)->getAppearMode() == 3) {
@@ -2123,7 +2123,7 @@ void daB_ZANT_c::executeWater() {
case 24:
cLib_addCalcAngleS(&shape_angle.y, fopAcM_searchPlayerAngleY(this), 8, 0x400, 0x80);
if (((daB_ZANTZ_c*)pmobile)->getMouthMode() == 1) {
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
field_0x703 = 8;
field_0x6ff = 0;
field_0x711 = 1;
@@ -2223,7 +2223,7 @@ void daB_ZANT_c::executeSwim() {
setBck(BCK_ZAN_SWIM, J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f);
mpModelMorf->setFrame(10.0f);
field_0x6cc = 0.0f;
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
mMode = 1;
field_0x702 = 0;
case 1:
@@ -2397,7 +2397,7 @@ void daB_ZANT_c::executeSimaJump() {
field_0x6f0 = 105;
}
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
setBck(BCK_ZAN_LV1_FATIGUE, J3DFrameCtrl::EMode_LOOP, 10.0f, 1.0f);
mSound.startCreatureVoice(Z2SE_EN_ZAN_MG_V_ZEIZEI, -1);
return;
@@ -2408,7 +2408,7 @@ void daB_ZANT_c::executeSimaJump() {
return;
}
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
field_0x6ec = 0;
mMode = 1;
gravity = -5.0f;
@@ -2695,7 +2695,7 @@ void daB_ZANT_c::executeIceJump() {
mpModelMorf->setPlaySpeed(1.0f);
mMode = 7;
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
}
}
break;
@@ -3822,7 +3822,7 @@ void daB_ZANT_c::executeLastStartDemo() {
field_0x713 = 0;
setActionMode(ACT_LAST_ATTACK, 0);
field_0x70b = 0;
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
mDemoCamEye.set(0.0f, 300.0f, 200.0f);
camera->Reset(mDemoCamCenter, mDemoCamEye);
@@ -4287,7 +4287,7 @@ void daB_ZANT_c::executeLastDamage() {
mSwordCc[1].OffAtSetBit();
speedF = 0.0f;
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
if (mTakenBigDmg) {
if (mFightCycle == 0) {
@@ -4386,7 +4386,7 @@ void daB_ZANT_c::executeLastDamage() {
break;
}
case 10:
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
setBck(BCK_ZAN_GROUND_REACTION, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mSound.startCreatureVoice(Z2SE_EN_ZAN_V_NO_DMG, -1);
mMode = 11;
@@ -5598,7 +5598,7 @@ int daB_ZANT_c::create() {
l_HIO.field_0x4 = -1;
}
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
attention_info.distances[fopAc_attn_BATTLE_e] = 24;
fopAcM_SetMtx(this, mpModelMorf->getModel()->getBaseTRMtx());
src/d/actor/d_a_canoe.cpp
+2 -2
View File
@@ -873,9 +873,9 @@ int daCanoe_c::execute() {
setCanoeSliderEffect();
if (!player->checkCanoeRideOwn(this) && speedF < 0.1f && mWaterSpeed.abs2XZ() < 0.1f && !player->checkFishingRodEquip()) {
attention_info.flags |= 0x80;
attention_info.flags |= fopAc_AttnFlag_ETC_e;
} else {
attention_info.flags &= ~0x80;
attention_info.flags &= ~fopAc_AttnFlag_ETC_e;
}
u32 sp1C = 127.0f * (fabsf(speedF) / player->getCanoeMaxSpeed());
src/d/actor/d_a_coach_fire.cpp
+1 -1
View File
@@ -22,7 +22,7 @@ CoachFireAttr const daCoachFire_c::M_attr = {
void daCoachFire_c::create_init() {
fopAcM_setStageLayer(this);
fopAcM_setCullSizeBox(this, -100.0, -10.0, -100.0, 100.0, 200.0, 100.0);
attention_info.flags = 0x101;
attention_info.flags = fopAc_AttnFlag_CHECK_e | fopAc_AttnFlag_LOCK_e;
attention_info.distances[fopAc_attn_LOCK_e] = 0x24;
attention_info.distances[fopAc_attn_CHECK_e] = 0x22;
mLightInfluence.mPosition = current.pos;
src/d/actor/d_a_cow.cpp
+10 -10
View File
@@ -199,7 +199,7 @@ void daCow_c::setCarryStatus() {
mDoMtx_stack_c::multVec(&daPy_getPlayerActorClass()->current.pos, &carryPosition);
if (fabsf(carryPosition.x) < xMax && carryPosition.z > 0.0f && carryPosition.z < zMax) {
// todo: what does this mean
attention_info.flags |= 0x10; // in debug this is 0x80
attention_info.flags |= fopAc_AttnFlag_CARRY_e; // in debug this is 0x80
}
}
@@ -208,7 +208,7 @@ void daCow_c::setActetcStatus() {
if (!mNadeNade) {
s32 playerAngle = fopAcM_seenPlayerAngleY(this);
if (playerAngle < 0x6000 && playerAngle > 0x2000) {
attention_info.flags |= 0x80; // in debug this is 0x800
attention_info.flags |= fopAc_AttnFlag_ETC_e; // in debug this is 0x800
}
}
}
@@ -1698,9 +1698,9 @@ void daCow_c::action_angry() {
setSeSnort();
if (!player->checkHorseRide()) {
attention_info.flags |= 1;
attention_info.flags |= fopAc_AttnFlag_LOCK_e;
} else {
attention_info.flags &= ~1;
attention_info.flags &= ~fopAc_AttnFlag_LOCK_e;
}
if (mCrazy == daCow_c::Crazy_Dash) {
setCarryStatus();
@@ -1908,7 +1908,7 @@ void daCow_c::action_angry() {
mJoint1Offset.y = 0;
mJoint8Offset.y = 0;
attention_info.flags &= ~1;
attention_info.flags &= ~fopAc_AttnFlag_LOCK_e;
break;
}
}
@@ -2780,7 +2780,7 @@ void daCow_c::action_wolf() {
mMode = daCow_c::Mode_1;
mCrazy = daCow_c::Crazy_Wait;
calcRunAnime(true);
attention_info.flags |= 1;
attention_info.flags |= fopAc_AttnFlag_LOCK_e;
mSound.startCreatureVoice(Z2SE_GOAT_V_ANGRY, -1);
mTimer10 = cM_rndF(90.0f) + 90.0f;
break;
@@ -2877,7 +2877,7 @@ void daCow_c::action_wolf() {
mJoint1Offset.y = 0;
mJoint8Offset.y = 0;
attention_info.flags &= ~0x1;
attention_info.flags &= ~fopAc_AttnFlag_LOCK_e;
for (int iWolfBuster = 0; iWolfBuster < N_WOLF_BUSTERS; iWolfBuster++) {
if (gWolfBustersID[iWolfBuster] == fopAcM_GetID(this)) {
@@ -2962,7 +2962,7 @@ void daCow_c::setAttnPos() {
cXyz pos;
if (mpMorf) {
if (attention_info.flags & 0x80) {
if (attention_info.flags & fopAc_AttnFlag_ETC_e) {
arg.set(0.0f, 0.0f, 0.0f);
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(11));
mDoMtx_stack_c::multVec(&arg, &eyePos);
@@ -3020,8 +3020,8 @@ int daCow_c::Execute() {
mCounter1++;
mJointIndex = 0;
attention_info.flags &= ~0x10;
attention_info.flags &= ~0x80;
attention_info.flags &= ~fopAc_AttnFlag_CARRY_e;
attention_info.flags &= ~fopAc_AttnFlag_ETC_e;
action();
if (!mDrawOff) {
src/d/actor/d_a_cstatue.cpp
+3 -3
View File
@@ -383,7 +383,7 @@ int daCstatue_c::create() {
mSph->SetTgType(0xd97afddf);
mControlDistanceOffset = JMAFastSqrt(650000.0f);
attention_info.distances[0] = 92;
cLib_onBit<u32>(attention_info.flags, 1);
cLib_onBit<u32>(attention_info.flags, fopAc_AttnFlag_LOCK_e);
mTargetFrame = 35.0f;
}
mControlDistanceOffset += 100.0f;
@@ -1160,9 +1160,9 @@ int daCstatue_c::execute() {
setCollision();
if (mType == daCstatueType_Small) {
if (mStatueAcch.ChkGroundHit() && !fopAcM_checkCarryNow(this)) {
cLib_onBit<u32>(attention_info.flags, 0x10); // this is 0x80 in the debug rom
cLib_onBit<u32>(attention_info.flags, fopAc_AttnFlag_CARRY_e);
} else {
cLib_offBit<u32>(attention_info.flags, 0x10); // this is 0x80 in the debug rom
cLib_offBit<u32>(attention_info.flags, fopAc_AttnFlag_CARRY_e);
}
}
src/d/actor/d_a_do.cpp
+4 -4
View File
@@ -1957,13 +1957,13 @@ static void action(do_class* i_this) {
}
if (carry_check && player->speedF < 2.0f) {
cLib_onBit<u32>(_this->attention_info.flags, 0x10);
cLib_onBit<u32>(_this->attention_info.flags, fopAc_AttnFlag_CARRY_e);
if (do_carry_check(i_this)) {
return;
}
} else {
cLib_offBit<u32>(_this->attention_info.flags, 0x10);
cLib_offBit<u32>(_this->attention_info.flags, fopAc_AttnFlag_CARRY_e);
}
cLib_addCalcAngleS2(&_this->current.angle.x, 0, 1, 0x400);
@@ -2244,11 +2244,11 @@ static void message(do_class* i_this) {
if (i_this->mMessageState == 2 && i_this->mFlowID != -1 && daPy_py_c::checkNowWolf()) {
fopAcM_OnStatus(i_this, 0);
cLib_onBit<u32>(i_this->attention_info.flags, 0xa);
cLib_onBit<u32>(i_this->attention_info.flags, fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_TALK_e);
i_this->eventInfo.onCondition(dEvtCnd_CANTALK_e);
} else {
fopAcM_OffStatus(i_this, 0);
cLib_offBit<u32>(i_this->attention_info.flags, 0xa);
cLib_offBit<u32>(i_this->attention_info.flags, fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_TALK_e);
}
}
}
src/d/actor/d_a_door_boss.cpp
+2 -2
View File
@@ -100,7 +100,7 @@ int daBdoor_c::CreateInit() {
setAction(ACT_CLOSE_WAIT);
attention_info.position.y += 250.0f;
eyePos.y += 250.0f;
attention_info.flags = 0x20;
attention_info.flags = fopAc_AttnFlag_DOOR_e;
calcMtx();
mpBgW->Move();
u32 swbit = door_param2_c::getSwbit(this);
@@ -362,7 +362,7 @@ int daBdoor_c::execute() {
&actionOpen,
&actionEnd,
};
if (fopAcM_checkStatus(this, 0x1000)) {
if (fopAcM_CheckStatus(this, 0x1000)) {
mStaffID = dComIfGp_evmng_getMyStaffId(l_staff_name, NULL, 0);
demoProc();
} else {
src/d/actor/d_a_door_bossL1.cpp
+2 -2
View File
@@ -326,7 +326,7 @@ int daBdoorL1_c::CreateInit() {
setAction(ACTION_CLOSE_WAIT);
attention_info.position.y += 250.0f;
eyePos.y += 250.0f;
attention_info.flags = 0x20;
attention_info.flags = fopAc_AttnFlag_DOOR_e;
if (checkFront()) {
field_0x5a8 = -60.0f;
} else {
@@ -955,7 +955,7 @@ int daBdoorL1_c::actionEnd() {
/* 804E464C-804E476C 00292C 0120+00 1/1 0/0 0/0 .text execute__11daBdoorL1_cFv */
int daBdoorL1_c::execute() {
static actionFunc l_action[4] = {&daBdoorL1_c::actionWait, &daBdoorL1_c::actionCloseWait, &daBdoorL1_c::actionOpen, &daBdoorL1_c::actionEnd};
if (fopAcM_checkStatus(this, 0x1000)) {
if (fopAcM_CheckStatus(this, 0x1000)) {
field_0x5a0 = dComIfGp_evmng_getMyStaffId(l_staff_name, 0, 0);
dMeter2Info_onGameStatus(2);
demoProc();
src/d/actor/d_a_door_bossL5.cpp
+2 -2
View File
@@ -127,7 +127,7 @@ int daBdoorL5_c::CreateInit() {
setAction(ACTION_CLOSE_WAIT);
attention_info.position.y += 250.0f;
eyePos.y += 250.0f;
attention_info.flags = 0x20;
attention_info.flags = fopAc_AttnFlag_DOOR_e;
calcMtx();
field_0x588->Move();
door_param2_c::getSwbit(this);
@@ -480,7 +480,7 @@ int daBdoorL5_c::actionEnd() {
int daBdoorL5_c::execute() {
static actionFunc l_action[4] = {&daBdoorL5_c::actionWait, &daBdoorL5_c::actionCloseWait, &daBdoorL5_c::actionOpen, &daBdoorL5_c::actionEnd};
field_0x59c = -1;
if (fopAcM_checkStatus(this, 0x1000)) {
if (fopAcM_CheckStatus(this, 0x1000)) {
field_0x59c = dComIfGp_evmng_getMyStaffId(l_staff_name, 0, 0);
dMeter2Info_onGameStatus(2);
demoProc();
src/d/actor/d_a_door_dbdoor00.cpp
+1 -1
View File
@@ -157,7 +157,7 @@ int daDbDoor00_c::CreateInit() {
field_0x594 = 0x1e;
attention_info.position.y += 250.0f;
eyePos.y += 250.0f;
attention_info.flags = 0x20;
attention_info.flags = fopAc_AttnFlag_DOOR_e;
calcMtx();
mpBgW->Move();
return 1;
src/d/actor/d_a_door_knob00.cpp
+2 -2
View File
@@ -141,7 +141,7 @@ int daKnob20_c::CreateInit() {
setAction(ACTION_INIT);
attention_info.position.y += 150.0f;
eyePos.y += 150.0f;
attention_info.flags = 0x20;
attention_info.flags = fopAc_AttnFlag_DOOR_e;
calcMtx();
fopAcM_SetMtx(this, mModel1->getBaseTRMtx());
fopAcM_setCullSizeFar(this, 2.0f);
@@ -691,7 +691,7 @@ int daKnob20_c::execute() {
setActionFromFlow();
field_0x60f = frontCheck();
if (fopAcM_checkStatus(this, 0x1000)) {
if (fopAcM_CheckStatus(this, 0x1000)) {
startDemoProc();
demoProc();
dMeter2Info_onGameStatus(2);
src/d/actor/d_a_door_mbossL1.cpp
+4 -4
View File
@@ -475,7 +475,7 @@ int daMBdoorL1_c::CreateInit() {
setAction(ACTION_INIT);
attention_info.position.y += 150.0f;
eyePos.y += 150.0f;
attention_info.flags = 0x20;
attention_info.flags = fopAc_AttnFlag_DOOR_e;
calcMtx();
field_0x598->Move();
eventInfo.setArchiveName(getArcName());
@@ -991,7 +991,7 @@ int daMBdoorL1_c::openInit() {
}
}
}
if (fopAcM_checkStatus(this, 0x1000)) {
if (fopAcM_CheckStatus(this, 0x1000)) {
fopAcM_onSwitch(this, swBit3);
}
field_0x5e1 = 1;
@@ -1677,7 +1677,7 @@ int daMBdoorL1_c::actionOpen() {
/* 80676ED8-80676FE4 004718 010C+00 1/0 0/0 0/0 .text actionInit__12daMBdoorL1_cFv */
int daMBdoorL1_c::actionInit() {
if (fopAcM_checkStatus(this, 0x1000)) {
if (fopAcM_CheckStatus(this, 0x1000)) {
setAction(ACTION_START_DEMO);
actionStartDemo();
} else {
@@ -1704,7 +1704,7 @@ int daMBdoorL1_c::actionInit() {
int daMBdoorL1_c::actionStartDemo() {
field_0x5e8 = dComIfGp_evmng_getMyStaffId(l_staff_name, NULL, 0);
demoProc();
if (!fopAcM_checkStatus(this, 0x1000)) {
if (!fopAcM_CheckStatus(this, 0x1000)) {
setAction(ACTION_CLOSE_WAIT);
}
return 1;
src/d/actor/d_a_door_shutter.cpp
+2 -2
View File
@@ -778,7 +778,7 @@ int daDoor20_c::CreateInit() {
setAction(ACTION_INIT);
attention_info.position.y += 150.0f;
eyePos.y += 150.0f;
attention_info.flags = 0x20;
attention_info.flags = fopAc_AttnFlag_DOOR_e;
fopAcM_SetMtx(this, field_0x5f4);
if (door_param2_c::getKind(this) == 10) {
fopAcM_setCullSizeBox(this, -300.0f, 0, -50.0f, 300.0f, 700.0f, 50.0f);
@@ -1547,7 +1547,7 @@ int daDoor20_c::drawCheck(int param_1) {
/* 80464E18-80464EC4 004358 00AC+00 1/1 0/0 0/0 .text checkExecute__10daDoor20_cFv */
int daDoor20_c::checkExecute() {
field_0x68c = frontCheck();
if (fopAcM_checkStatus(this, 0x1000)) {
if (fopAcM_CheckStatus(this, 0x1000)) {
return 1;
}
if (eventInfo.checkCommandDemoAccrpt() || eventInfo.checkCommandDoor()) {
src/d/actor/d_a_e_ai.cpp
+1 -1
View File
@@ -938,7 +938,7 @@ int e_ai_class::Create() {
l_HIO.id = mDoHIO_CREATE_CHILD("アモス", &l_HIO);
}
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
fopAcM_SetMtx(this, m_modelMorf->getModel()->getBaseTRMtx());
fopAcM_SetMin(this, -200.0f, -300.0f, -200.0f);
src/d/actor/d_a_e_ba.cpp
+3 -3
View File
@@ -917,7 +917,7 @@ static int daE_BA_Execute(e_ba_class* i_this) {
if (a_this->health > 0 && !i_this->mIsDying
&& player->current.pos.y < a_this->current.pos.y) {
fopAcM_OnStatus(a_this, 0);
a_this->attention_info.flags = 4;
a_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
} else {
fopAcM_OffStatus(a_this, 0);
a_this->attention_info.flags = 0;
@@ -983,7 +983,7 @@ static int daE_BA_Execute(e_ba_class* i_this) {
}
}
a_this->attention_info.flags |= 0x200000;
a_this->attention_info.flags |= fopAc_AttnFlag_UNK_0x200000;
return 1;
}
@@ -1094,7 +1094,7 @@ static cPhs__Step daE_BA_Create(fopAc_ac_c* i_this) {
l_HIO.field_0x04 = -1;
}
i_this->attention_info.flags = 4;
i_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
fopAcM_SetMtx(i_this, _this->mpMorf->getModel()->getBaseTRMtx());
fopAcM_SetMin(i_this, -200.0f, -200.0f, -200.0f);
fopAcM_SetMax(i_this, 200.0f, 200.0f, 200.0f);
src/d/actor/d_a_e_bg.cpp
+6 -18
View File
@@ -754,11 +754,7 @@ bool daE_BG_c::setBombCarry(int param_0) {
fopAc_ac_c* bomb = NULL;
if (param_0 == 0) {
#if VERSION == VERSION_SHIELD_DEBUG
cLib_onBit<u32>(attention_info.flags, 0x80);
#else
cLib_onBit<u32>(attention_info.flags, 0x10);
#endif
cLib_onBit<u32>(attention_info.flags, fopAc_AttnFlag_CARRY_e);
if (fopAcM_checkCarryNow(this)) {
shape_angle.x = 0;
@@ -867,11 +863,7 @@ void daE_BG_c::executeBirth() {
field_0x6a0 = 0x3000;
shape_angle.x = 0x2000;
#if VERSION == VERSION_SHIELD_DEBUG
cLib_onBit<u32>(attention_info.flags, 0x80);
#else
cLib_onBit<u32>(attention_info.flags, 0x10);
#endif
cLib_onBit<u32>(attention_info.flags, fopAc_AttnFlag_CARRY_e);
mCreatureSound.startCreatureSound(Z2SE_EN_BG_SANDSMOKE, 0, -1);
@@ -904,11 +896,7 @@ void daE_BG_c::executeBirth() {
field_0x688 = 0.0f;
speed.y = 10.0f;
#if VERSION == VERSION_SHIELD_DEBUG
cLib_offBit<u32>(attention_info.flags, 0x80);
#else
cLib_offBit<u32>(attention_info.flags, 0x10);
#endif
cLib_offBit<u32>(attention_info.flags, fopAc_AttnFlag_CARRY_e);
mAtSphere.OnAtSetBit();
}
@@ -1142,9 +1130,9 @@ void daE_BG_c::action() {
dBgS_LinChk linChk;
linChk.Set(&dComIfGp_getCamera(0)->lookat.eye, &attention_info.position, this);
if (dComIfG_Bgsp().LineCross(&linChk)) {
attention_info.flags &= ~0x4;
attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e;
} else {
attention_info.flags |= 0x4;
attention_info.flags |= fopAc_AttnFlag_BATTLE_e;
}
}
@@ -1403,7 +1391,7 @@ int daE_BG_c::create() {
l_HIO.field_0x4 = mDoHIO_CREATE_CHILD("爆弾魚", &l_HIO);
}
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
fopAcM_SetMtx(this, mpMorfSO->getModel()->getBaseTRMtx());
fopAcM_SetMin(this, -50.0f, -50.0f, -50.0f);
src/d/actor/d_a_e_bi.cpp
+8 -8
View File
@@ -581,7 +581,7 @@ static void action(e_bi_class* i_this) {
if (bVar1 != 0) {
fopAcM_OnStatus(a_this, 0);
cLib_onBit<u32>(a_this->attention_info.flags, 4);
cLib_onBit<u32>(a_this->attention_info.flags, fopAc_AttnFlag_BATTLE_e);
} else {
fopAcM_OffStatus(a_this, 0);
a_this->attention_info.flags = 0;
@@ -608,10 +608,10 @@ static void action(e_bi_class* i_this) {
}
if (bVar3 != 0) {
cLib_onBit<u32>(a_this->attention_info.flags, 0x10);
cLib_onBit<u32>(a_this->attention_info.flags, fopAc_AttnFlag_CARRY_e);
if (fopAcM_checkCarryNow(a_this)) {
cLib_offBit<u32>(a_this->attention_info.flags, 0x10);
cLib_offBit<u32>(a_this->attention_info.flags, fopAc_AttnFlag_CARRY_e);
fopAc_ac_c* bomb_p = dBomb_c::createEnemyBomb(&a_this->current.pos, &a_this->current.angle, fopAcM_GetRoomNo(a_this));
if (bomb_p == NULL) {
@@ -630,10 +630,10 @@ static void action(e_bi_class* i_this) {
}
}
cLib_offBit<u32>(a_this->attention_info.flags, 4);
cLib_offBit<u32>(a_this->attention_info.flags, fopAc_AttnFlag_BATTLE_e);
} else {
cLib_offBit<u32>(a_this->attention_info.flags, 0x10);
cLib_onBit<u32>(a_this->attention_info.flags, 4);
cLib_offBit<u32>(a_this->attention_info.flags, fopAc_AttnFlag_CARRY_e);
cLib_onBit<u32>(a_this->attention_info.flags, fopAc_AttnFlag_BATTLE_e);
}
if (bVar4 != 0 && water_check(i_this)) {
@@ -923,7 +923,7 @@ static cPhs__Step daE_BI_Create(fopAc_ac_c* a_this) {
l_HIO.field_0x4 = -1;
}
a_this->attention_info.flags = 4;
a_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
fopAcM_SetMtx(a_this, i_this->mpModelMorf->getModel()->getBaseTRMtx());
fopAcM_SetMin(a_this, -200.0f, -200.0f, -200.0f);
fopAcM_SetMax(a_this, 200.0f, 200.0f, 200.0f);
@@ -995,7 +995,7 @@ static cPhs__Step daE_BI_Create(fopAc_ac_c* a_this) {
}
if (fopAcM_GetRoomNo(a_this) == 50) {
a_this->attention_info.flags = 4;
a_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
a_this->attention_info.distances[fopAc_attn_BATTLE_e] = 22;
}
src/d/actor/d_a_e_bs.cpp
+2 -2
View File
@@ -562,7 +562,7 @@ static void action(e_bs_class* i_this) {
if (attn_ON) {
fopAcM_OnStatus(actor, 0);
actor->attention_info.flags = 4;
actor->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
} else {
fopAcM_OffStatus(actor, 0);
actor->attention_info.flags = 0;
@@ -878,7 +878,7 @@ static int daE_BS_Create(fopAc_ac_c* i_this) {
l_HIO.id = mDoHIO_CREATE_CHILD("ベビースタル", &l_HIO);
}
i_this->attention_info.flags = 4;
i_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
fopAcM_SetMtx(i_this, a_this->modelMorf->getModel()->getBaseTRMtx());
src/d/actor/d_a_e_bu.cpp
+2 -2
View File
@@ -891,7 +891,7 @@ static s8 action(e_bu_class* i_this) {
actor->attention_info.flags = 0;
} else {
fopAcM_OnStatus(actor, 0);
actor->attention_info.flags = 4;
actor->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
}
} else {
fopAcM_OffStatus(actor, 0);
@@ -1108,7 +1108,7 @@ static int daE_BU_Create(fopAc_ac_c* i_this) {
l_HIO.id = mDoHIO_CREATE_CHILD("バブル", &l_HIO);
}
i_this->attention_info.flags = 4;
i_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
fopAcM_SetMtx(i_this, a_this->modelMorf->getModel()->getBaseTRMtx());
fopAcM_SetMin(i_this, -200.0f, -200.0f, -200.0f);
fopAcM_SetMax(i_this, 200.0f, 200.0f, 200.0f);
src/d/actor/d_a_e_cr.cpp
+2 -2
View File
@@ -363,7 +363,7 @@ static void action(e_cr_class* a_this) {
if (attn_ON) {
fopAcM_OnStatus(actor, 0);
actor->attention_info.flags = 4;
actor->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
} else {
fopAcM_OffStatus(actor, 0);
actor->attention_info.flags = 0;
@@ -521,7 +521,7 @@ static int daE_CR_Create(fopAc_ac_c* i_this) {
l_HIO.id = mDoHIO_CREATE_CHILD("クレイジーランナー", &l_HIO);
}
i_this->attention_info.flags = 4;
i_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
fopAcM_SetMtx(i_this, a_this->modelMorf->getModel()->getBaseTRMtx());
i_this->health = 1;
src/d/actor/d_a_e_db.cpp
+2 -2
View File
@@ -1794,7 +1794,7 @@ static void action(e_db_class* i_this) {
if (attn_ON) {
fopAcM_OnStatus(actor, 0);
actor->attention_info.flags = 4;
actor->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
} else {
fopAcM_OffStatus(actor, 0);
actor->attention_info.flags = 0;
@@ -2141,7 +2141,7 @@ static int daE_DB_Create(fopAc_ac_c* i_this) {
l_HIO.id = mDoHIO_CREATE_CHILD("デグババ", &l_HIO);
}
i_this->attention_info.flags = 4;
i_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
fopAcM_SetMtx(i_this, a_this->modelMorf->getModel()->getBaseTRMtx());
fopAcM_SetMin(i_this, -300.0f, -400.0f, -300.0f);
src/d/actor/d_a_e_dd.cpp
+2 -2
View File
@@ -1199,7 +1199,7 @@ static void action(e_dd_class* i_this) {
if (bVar1 != 0) {
fopAcM_OnStatus(a_this, 0);
a_this->attention_info.flags = 4;
a_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
} else {
fopAcM_OffStatus(a_this, 0);
a_this->attention_info.flags = 0;
@@ -1737,7 +1737,7 @@ static cPhs__Step daE_DD_Create(fopAc_ac_c* a_this) {
l_HIO.field_0x4 = -1;
}
a_this->attention_info.flags = 4;
a_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
fopAcM_SetMtx(a_this, i_this->mpModelMorf->getModel()->getBaseTRMtx());
fopAcM_SetMin(a_this, -500.0f, -200.0f, -500.0f);
fopAcM_SetMax(a_this, 500.0f, 200.0f, 500.0f);
src/d/actor/d_a_e_df.cpp
+1 -1
View File
@@ -704,7 +704,7 @@ int daE_DF_c::Create() {
mHIOInit = TRUE;
l_HIO.mNo = mDoHIO_CREATE_CHILD("デクレシア", &l_HIO);
}
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
fopAcM_SetMtx(this, mpMorfSO->getModel()->getBaseTRMtx());
fopAcM_SetMin(this, -200.0f, -200.0f, -200.0f);
src/d/actor/d_a_e_dk.cpp
+3 -3
View File
@@ -678,7 +678,7 @@ void daE_DK_c::executeDeath() {
field_0x68e = 0;
attention_info.flags = 0x0;
attention_info.flags = 0;
mCreatureSound.startCreatureSound(Z2SE_EN_DK_PULLOUT, 0, -1);
@@ -719,7 +719,7 @@ void daE_DK_c::executeDeath() {
BodyDeathMove();
if (fopAcM_checkStatus(this, 0x100000) == 0) {
if (fopAcM_CheckStatus(this, 0x100000) == 0) {
mMoveMode = 3;
mpMorfSO->setPlaySpeed(1.0f);
@@ -1059,7 +1059,7 @@ int daE_DK_c::create() {
l_HIO.field_0x4 = mDoHIO_CREATE_CHILD("", &l_HIO);
}
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
fopAcM_SetMtx(this, mpMorfSO->getModel()->getBaseTRMtx());
fopAcM_SetMin(this, -200.0, -200.0, -200.0);
src/d/actor/d_a_e_dn.cpp
+3 -3
View File
@@ -2400,7 +2400,7 @@ static void action(e_dn_class* i_this) {
a_this->attention_info.flags = 0;
} else {
fopAcM_OnStatus(a_this, 0);
a_this->attention_info.flags = 4;
a_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
}
switch (i_this->mAction) {
@@ -3218,7 +3218,7 @@ static int daE_DN_Execute(e_dn_class* i_this) {
sp80.y += 180.0f;
((fopEn_enemy_c*) i_this)->setHeadLockPos(&sp80);
a_this->attention_info.flags |= 0x200000;
a_this->attention_info.flags |= fopAc_AttnFlag_UNK_0x200000;
if ((a_this->current.pos.y - a_this->home.pos.y) < -5000.0f) {
fopAcM_delete(a_this);
@@ -3373,7 +3373,7 @@ static cPhs__Step daE_DN_Create(fopAc_ac_c* a_this) {
}
fopAcM_OnStatus(a_this, fopAcM_STATUS_UNK_000100);
a_this->attention_info.flags = 4;
a_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
fopAcM_SetMtx(a_this, i_this->mpModelMorf->getModel()->getBaseTRMtx());
fopAcM_SetMin(a_this, -200.0f, -200.0f, -200.0f);
fopAcM_SetMax(a_this, 200.0f, 200.0f, 200.0f);
src/d/actor/d_a_e_dt.cpp
+3 -3
View File
@@ -1993,7 +1993,7 @@ void daE_DT_c::executeOpening() {
camera->Start();
camera->SetTrimSize(0);
dComIfGp_event_reset();
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
Z2GetAudioMgr()->subBgmStart(Z2BGM_DEKUTOAD);
fpcM_Search(s_demo_otama, this);
return;
@@ -2572,7 +2572,7 @@ cPhs__Step daE_DT_c::create() {
l_HIO.field_0x4 = -1;
}
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx());
fopAcM_SetMin(this, -700.0f, -200.0f, -700.0f);
fopAcM_SetMax(this, 700.0f, 500.0f, 700.0f);
@@ -2616,7 +2616,7 @@ cPhs__Step daE_DT_c::create() {
gravity = -5.0f;
setActionMode(ACT_WAIT, 0);
maxFallSpeed = l_HIO.mMaxFallSpeed;
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
current.pos.set(0.0f, 0.0f, -500.0f);
shape_angle.y = cLib_targetAngleY(&current.pos, &daPy_getPlayerActorClass()->current.pos);
Z2GetAudioMgr()->subBgmStart(Z2BGM_DEKUTOAD);
src/d/actor/d_a_e_fm.cpp
+2 -2
View File
@@ -2777,7 +2777,7 @@ static void action(e_fm_class* i_this) {
if (attn_on) {
fopAcM_OnStatus(actor, 0);
actor->attention_info.flags = 4;
actor->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
} else {
fopAcM_OffStatus(actor, 0);
actor->attention_info.flags = 0;
@@ -3815,7 +3815,7 @@ static int daE_FM_Create(fopAc_ac_c* i_this) {
l_HIO.no = mDoHIO_CREATE_CHILD("火魔人", &l_HIO);
}
i_this->attention_info.flags = 4;
i_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
fopAcM_SetMtx(i_this, a_this->mpFmModelMorf->getModel()->getBaseTRMtx());
fopAcM_SetMin(i_this, -200.0f, -200.0f, -200.0f);
src/d/actor/d_a_e_fs.cpp
+3 -3
View File
@@ -179,7 +179,7 @@ static void e_fs_appear(e_fs_class* i_this) {
anm_init(i_this, ANM_APPEAR, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode++;
a_this->current.angle.y = i_this->mPlayerAngleY;
a_this->attention_info.flags = 4;
a_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
i_this->mCreatureSound.startCreatureSound(Z2SE_EN_FS_APPEAR, 0, -1);
}
break;
@@ -536,7 +536,7 @@ static void e_fs_demowait(e_fs_class* i_this) {
if (i_this->mTimer[0] == 0) {
i_this->mAction = e_fs_class::ACT_MOVE;
i_this->mMode = 0;
a_this->attention_info.flags = 4;
a_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
}
break;
}
@@ -850,7 +850,7 @@ static cPhs__Step daE_Fs_Create(fopAc_ac_c* i_this) {
i_this->field_0x560 = 30;
i_this->health = 30;
i_this->attention_info.flags = 4;
i_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
if (_this->field_0x5b5 >= 1) {
_this->mMode = -1;
src/d/actor/d_a_e_fz.cpp
+7 -7
View File
@@ -161,7 +161,7 @@ void daE_FZ_c::deadnextSet(bool param_0) {
mTgCoSph.ClrTgHit();
fopAcM_OffStatus(this,0);
attention_info.flags &= 0xfffffffb;
attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e;
mAtSph.OffAtSetBit();
mTgCoSph.OffTgSetBit();
@@ -696,10 +696,10 @@ void daE_FZ_c::action() {
if (!fopAcM_otherBgCheck(this, dComIfGp_getPlayer(0))) {
fopAcM_OnStatus(this, 0);
attention_info.flags |= 4;
attention_info.flags |= fopAc_AttnFlag_BATTLE_e;
} else {
fopAcM_OffStatus(this, 0);
attention_info.flags &= 0xfffffffb;
attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e;
}
linkSearch = false;
@@ -860,7 +860,7 @@ s32 daE_FZ_c::execute() {
#if DEBUG
fopAcM_OnStatus(this,0);
#endif
attention_info.flags |= 4;
attention_info.flags |= fopAc_AttnFlag_BATTLE_e;
}
}
@@ -970,7 +970,7 @@ s32 daE_FZ_c::create() {
l_HIO.field_0x04 = -1;
}
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
attention_info.distances[fopAc_attn_BATTLE_e] = 69;
fopAcM_SetMtx(this,mpModel->getBaseTRMtx());
@@ -1039,12 +1039,12 @@ s32 daE_FZ_c::create() {
attention_info.distances[fopAc_attn_BATTLE_e] = 0;
fopAcM_SetGroup(this,0);
fopAcM_OffStatus(this,0);
attention_info.flags &= 0xfffffffb;
attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e;
}
if (field_0x714 == 3) {
mRadiusBase = 0.0f;
attention_info.flags &= 0xfffffffb;
attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e;
mAtSph.SetAtType(AT_TYPE_CSTATUE_SWING);
mAtSph.SetAtSpl(dCcG_At_Spl_UNK_1);
setActionMode(ACT_ROLLMOVE,0);
src/d/actor/d_a_e_gb.cpp
+2 -2
View File
@@ -795,7 +795,7 @@ static void action(e_gb_class* i_this) {
if (bVar1 != 0) {
fopAcM_OnStatus(a_this, 0);
a_this->attention_info.flags = 4;
a_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
} else {
fopAcM_OffStatus(a_this, 0);
a_this->attention_info.flags = 0;
@@ -1622,7 +1622,7 @@ static cPhs__Step daE_GB_Create(fopAc_ac_c* a_this) {
l_HIO.field_0x4 = -1;
}
a_this->attention_info.flags = 4;
a_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
a_this->health = 90;
a_this->field_0x560 = 90;
src/d/actor/d_a_e_gi.cpp
+4 -4
View File
@@ -813,7 +813,7 @@ void daE_GI_c::action() {
damage_check();
u8 is_battle_on = FALSE;
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
switch (mActionMode) {
case ACTION_SLEEP_e:
@@ -844,11 +844,11 @@ void daE_GI_c::action() {
mIsBattleOn = is_battle_on;
mSound.setLinkSearch(is_battle_on);
if (attention_info.flags & 4) {
if (attention_info.flags & fopAc_AttnFlag_BATTLE_e) {
dBgS_LinChk linecheck;
linecheck.Set(&dComIfGp_getCamera(0)->lookat.eye, &attention_info.position, this);
if (dComIfG_Bgsp().LineCross(&linecheck)) {
attention_info.flags &= ~0x4;
attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e;
}
}
@@ -1088,7 +1088,7 @@ int daE_GI_c::create() {
l_HIO.id = mDoHIO_CREATE_CHILD("ギブド", &l_HIO);
}
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
fopAcM_SetMtx(this, mpModelMorf->getModel()->getBaseTRMtx());
fopAcM_SetMin(this, -200.0f, -200.0f, -200.0f);
fopAcM_SetMax(this, 200.0f, 200.0f, 200.0f);
src/d/actor/d_a_e_gob.cpp
+6 -6
View File
@@ -722,7 +722,7 @@ static u8 ball(e_gob_class* i_this) {
mDoMtx_stack_c::multVec(&daPy_getPlayerActorClass()->current.pos, &sp2C);
if (fabsf(sp2C.x) < var_f28 && sp2C.z > temp_f27 && sp2C.z < var_f29) {
actor->attention_info.flags |= 0x10;
actor->attention_info.flags |= fopAc_AttnFlag_CARRY_e;
}
if (enemy->checkThrowMode(2)) {
@@ -1256,7 +1256,7 @@ static void message(e_gob_class* i_this) {
}
if (i_this->mPlayerDist < 600.0f) {
cLib_onBit<u32>(actor->attention_info.flags, 0xA);
cLib_onBit<u32>(actor->attention_info.flags, fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_TALK_e);
i_this->eventInfo.onCondition(1);
if (dComIfGp_event_runCheck()) {
@@ -1318,7 +1318,7 @@ static void action(e_gob_class* i_this) {
u8 stop_subbgm = TRUE;
int sp2C = 4;
cLib_offBit<u32>(actor->attention_info.flags, 0x1A);
cLib_offBit<u32>(actor->attention_info.flags, fopAc_AttnFlag_CARRY_e | fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_TALK_e);
int sp28 = 1;
switch (i_this->mAction) {
@@ -1420,10 +1420,10 @@ static void action(e_gob_class* i_this) {
if (on_attention) {
fopAcM_OnStatus(i_this, 0);
actor->attention_info.flags |= 4;
actor->attention_info.flags |= fopAc_AttnFlag_BATTLE_e;
} else {
fopAcM_OffStatus(i_this, 0);
actor->attention_info.flags &= ~4;
actor->attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e;
}
if (spD && i_this->mPlayerDist < 400.0f && daPy_getPlayerActorClass()->getCutType() != 0x29 && daPy_getPlayerActorClass()->getCutAtFlg() != 0 && i_this->field_0x6aa == 0) {
@@ -2328,7 +2328,7 @@ static int daE_GOB_Create(fopAc_ac_c* i_this) {
l_HIO.id = mDoHIO_CREATE_CHILD("マグネゴロン", &l_HIO);
}
i_this->attention_info.flags = 4;
i_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
fopAcM_SetMtx(i_this, a_this->mpModelMorf->getModel()->getBaseTRMtx());
fopAcM_SetMin(i_this, -400.0f, -500.0f, -400.0f);
src/d/actor/d_a_e_hb.cpp
+2 -2
View File
@@ -1103,7 +1103,7 @@ static void action(e_hb_class* i_this) {
if (attn_ON) {
fopAcM_OnStatus(actor, 0);
actor->attention_info.flags = 4;
actor->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
} else {
fopAcM_OffStatus(actor, 0);
actor->attention_info.flags = 0;
@@ -1445,7 +1445,7 @@ static int daE_HB_Create(fopAc_ac_c* i_this) {
l_HIO.id = mDoHIO_CREATE_CHILD("デグババ（ボックリ）", &l_HIO);
}
i_this->attention_info.flags = 4;
i_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
fopAcM_SetMtx(i_this, a_this->modelMorf->getModel()->getBaseTRMtx());
fopAcM_SetMin(i_this, -300.0f, -400.0f, -300.0f);
src/d/actor/d_a_e_hp.cpp
+9 -9
View File
@@ -183,7 +183,7 @@ int daE_HP_c::draw() {
attention_info.distances[fopAc_attn_BATTLE_e] = 0x04;
fopAcM_SetGroup(this, 2);
fopAcM_OnStatus(this, 0);
attention_info.flags = attention_info.flags | 4;
attention_info.flags |= fopAc_AttnFlag_BATTLE_e;
}
J3DModel* model = mpMorfSO->getModel();
@@ -929,7 +929,7 @@ void daE_HP_c::action() {
if (field_0x790 > 250.0f) {
unkXyz1 = home.pos - player->current.pos;
fopAcM_OnStatus(this, 0);
attention_info.flags |= 0x4;
attention_info.flags |= fopAc_AttnFlag_BATTLE_e;
if (unkXyz1.abs() < mDisHani) {
if (abs((s16)(current.angle.y - fopAcM_searchPlayerAngleY(this))) < 0x4000 &&
@@ -945,7 +945,7 @@ void daE_HP_c::action() {
}
} else {
fopAcM_OffStatus(this, 0);
attention_info.flags = attention_info.flags & 0xfffffffb;
attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e;
}
cLib_addCalcAngleS2(&field_0x7aa, angleDiff, 8, 0x400);
@@ -1063,7 +1063,7 @@ int daE_HP_c::execute() {
fopAcM_SetGroup(this, 0);
fopAcM_OffStatus(this, 0);
attention_info.flags &= ~0x4;
attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e;
if (field_0x78b == 0) {
field_0x790 = 0.0f;
@@ -1081,7 +1081,7 @@ int daE_HP_c::execute() {
fopAcM_SetGroup(this, 0);
fopAcM_OffStatus(this, 0);
attention_info.flags &= ~0x4;
attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e;
if (field_0x78b == 0) {
field_0x790 = 0.0f;
@@ -1099,7 +1099,7 @@ int daE_HP_c::execute() {
fopAcM_SetGroup(this, 2);
fopAcM_OnStatus(this, 0);
attention_info.flags = attention_info.flags | 4;
attention_info.flags |= fopAc_AttnFlag_BATTLE_e;
}
if (field_0x71c != 0) {
@@ -1262,7 +1262,7 @@ int daE_HP_c::create() {
home.pos.y = current.pos.y + 100.0f;
arg0 = 0x02;
}
attention_info.flags = 0x4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
fopAcM_SetMtx(this, mpMorfSO->getModel()->getBaseTRMtx());
fopAcM_SetMin(this, -200.0f, -200.0f, -200.0f);
@@ -1309,12 +1309,12 @@ int daE_HP_c::create() {
if (BREG_S(0) != 0 || mNight == 0 || dKy_daynight_check()) {
attention_info.distances[fopAc_attn_BATTLE_e] = 0x04;
fopAcM_OffStatus(this, 0);
attention_info.flags &= ~0x4;
attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e;
} else {
attention_info.distances[fopAc_attn_BATTLE_e] = 0;
fopAcM_SetGroup(this, 0);
fopAcM_OffStatus(this, 0);
attention_info.flags &= ~0x4;
attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e;
}
mtx_set();
src/d/actor/d_a_e_hzelda.cpp
+1 -1
View File
@@ -706,7 +706,7 @@ static void action(e_hzelda_class* i_this) {
if (on_attention) {
fopAcM_OnStatus(a_this, 0);
a_this->attention_info.flags = 4;
a_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
} else {
fopAcM_OffStatus(a_this, 0);
a_this->attention_info.flags = 0;
src/d/actor/d_a_e_is.cpp
+2 -2
View File
@@ -192,7 +192,7 @@ static void e_is_wait(e_is_class* a_this) {
a_this->mode = 3;
a_this->model_morf->setPlaySpeed(1.0f);
fopAcM_OnStatus(actor, 0);
actor->attention_info.flags = 4;
actor->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
}
break;
case 3:
@@ -683,7 +683,7 @@ static int daE_IS_Create(fopAc_ac_c* i_this) {
l_HIO.id = mDoHIO_CREATE_CHILD("動くイデリア石像", &l_HIO);
}
i_this->attention_info.flags = 4;
i_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
fopAcM_SetMtx(i_this, a_this->model_morf->getModel()->getBaseTRMtx());
fopAcM_SetMin(i_this, -500.0f, -200.0f, -500.0f);
src/d/actor/d_a_e_kg.cpp
+1 -1
View File
@@ -736,7 +736,7 @@ static int daE_KG_Create(fopAc_ac_c* i_this) {
l_HIO.field_0x4 = -1;
}
i_this->attention_info.flags = 4;
i_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
fopAcM_SetMtx(i_this, a_this->mpMorf->getModel()->getBaseTRMtx());
i_this->health = 0x50;
i_this->field_0x560 = 0x50;
src/d/actor/d_a_e_kk.cpp
+4 -4
View File
@@ -901,7 +901,7 @@ void daE_KK_c::executeDead() {
switch (mMoveMode) {
case 0:
fopAcM_OffStatus(this, 0);
attention_info.flags &= 0xFFFFFFFB;
attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e;
attention_info.distances[2] = 0;
offHeadLockFlg();
health = 0;
@@ -1300,7 +1300,7 @@ int daE_KK_c::execute() {
attention_info.distances[2] = 0x45;
fopAcM_SetGroup(this, 2);
fopAcM_OnStatus(this, 0);
attention_info.flags |= 4;
attention_info.flags |= fopAc_AttnFlag_BATTLE_e;
}
}
@@ -1479,7 +1479,7 @@ int daE_KK_c::create() {
field_0x760 = current.pos.y;
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
attention_info.distances[2] = 0x4C;
if (field_0x679 != 3) {
@@ -1501,7 +1501,7 @@ int daE_KK_c::create() {
attention_info.distances[2] = 0;
fopAcM_SetGroup(this, 0);
fopAcM_OffStatus(this, 0);
attention_info.flags &= 0xFFFFFFFB;
attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e;
}
if (field_0x67a == 0xFF || field_0x67a == 0) {
src/d/actor/d_a_e_kr.cpp
+1 -1
View File
@@ -1996,7 +1996,7 @@ static void action(e_kr_class* i_this) {
if (unkByte2) {
fopAcM_OnStatus(enemy, 0);
enemy->attention_info.flags = 4;
enemy->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
} else {
fopAcM_OffStatus(enemy, 0);
enemy->attention_info.flags = 0;
src/d/actor/d_a_e_mb.cpp
+2 -2
View File
@@ -573,7 +573,7 @@ static int daE_MB_Execute(e_mb_class* i_this) {
i_this->attention_info.position += i_this->eyePos;
fopAcM_OnStatus(i_this, 0);
i_this->attention_info.flags = 4;
i_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
} else {
i_this->mpBombModel2Morf->play(NULL, 0, 0);
@@ -749,7 +749,7 @@ static int daE_MB_Create(fopAc_ac_c* i_this) {
a_this->mCcSph.Set(cc_sph_src);
a_this->mCcSph.SetStts(&a_this->mColliderStts);
i_this->attention_info.flags = 4;
i_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
i_this->attention_info.distances[fopAc_attn_BATTLE_e] = 22;
a_this->field_0x6b0 = 1;
daE_MB_Execute(a_this);
src/d/actor/d_a_e_mf.cpp
+2 -2
View File
@@ -2289,7 +2289,7 @@ static void action(e_mf_class* i_this) {
a_this->attention_info.flags = 0;
} else {
fopAcM_OnStatus(a_this, 0);
a_this->attention_info.flags = 4;
a_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
}
switch (i_this->mAction) {
@@ -3235,7 +3235,7 @@ static cPhs__Step daE_MF_Create(fopAc_ac_c* a_this) {
}
fopAcM_OnStatus(a_this, fopAcM_STATUS_UNK_000100);
a_this->attention_info.flags = 4;
a_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
fopAcM_SetMtx(a_this, i_this->mpModelMorf->getModel()->getBaseTRMtx());
fopAcM_SetMin(a_this, -200.0f, -200.0f, -200.0f);
fopAcM_SetMax(a_this, 200.0f, 200.0f, 200.0f);
src/d/actor/d_a_e_mk.cpp
+2 -2
View File
@@ -2378,7 +2378,7 @@ static void action(e_mk_class* i_this) {
if (sVar2) {
fopAcM_OnStatus(a_this, 0);
a_this->attention_info.flags = 4;
a_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
} else {
fopAcM_OffStatus(a_this, 0);
a_this->attention_info.flags = 0;
@@ -2827,7 +2827,7 @@ static int daE_MK_Create(fopAc_ac_c* i_actor) {
l_HIO.field_0x4 = mDoHIO_CREATE_CHILD("ブーメラン猿", &l_HIO);
}
i_actor->attention_info.flags = 4;
i_actor->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
fopAcM_SetMtx(i_actor, mk->mpModelMorf->getModel()->getBaseTRMtx());
fopAcM_SetMin(i_actor, -500.0f, -500.0f, -500.0f);
src/d/actor/d_a_e_ms.cpp
+1 -1
View File
@@ -710,7 +710,7 @@ static void action(e_ms_class* i_this) {
if (sVar1 && i_this->health > 0) {
fopAcM_OnStatus(i_this, 0);
actor->attention_info.flags = 4;
actor->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
} else {
fopAcM_OffStatus(i_this, 0);
actor->attention_info.flags = 0;
src/d/actor/d_a_e_nest.cpp
+4 -4
View File
@@ -451,7 +451,7 @@ static s8 e_nest_carry(e_nest_class* i_this) {
switch (i_this->mMode) {
case 0:
cLib_offBit<u32>(i_this->attention_info.flags, 0x10);
cLib_offBit<u32>(i_this->attention_info.flags, fopAc_AttnFlag_CARRY_e);
i_this->mMode = 1;
s16 angle_delta_y = i_this->mRotation.y - player->shape_angle.y;
if (angle_delta_y > 0x4000 || angle_delta_y < -0x4000) {
@@ -720,7 +720,7 @@ static void bee_nest_action(e_nest_class* i_this) {
break;
case e_nest_class::ACT_DEBRIS:
e_nest_hahen(i_this);
cLib_offBit<u32>(i_this->attention_info.flags, 0x10);
cLib_offBit<u32>(i_this->attention_info.flags, fopAc_AttnFlag_CARRY_e);
return;
}
@@ -731,7 +731,7 @@ static void bee_nest_action(e_nest_class* i_this) {
}
if (carry_check) {
cLib_onBit<u32>(i_this->attention_info.flags, 0x10);
cLib_onBit<u32>(i_this->attention_info.flags, fopAc_AttnFlag_CARRY_e);
i_this->attention_info.distances[fopAc_attn_CARRY_e] = 0x2c;
if (fopAcM_checkCarryNow(i_this)) {
i_this->mAction = e_nest_class::ACT_CARRY;
@@ -739,7 +739,7 @@ static void bee_nest_action(e_nest_class* i_this) {
i_this->mCcSph.OffCoSetBit();
}
} else {
cLib_offBit<u32>(i_this->attention_info.flags, 0x10);
cLib_offBit<u32>(i_this->attention_info.flags, fopAc_AttnFlag_CARRY_e);
}
if (float_check && water_check(i_this)) {
src/d/actor/d_a_e_nz.cpp
+1 -1
View File
@@ -647,7 +647,7 @@ static int daE_NZ_Execute(e_nz_class* i_this) {
} else {
i_this->mSph.SetTgType(0xd8fbfdff);
fopAcM_OnStatus(a_this, 0);
a_this->attention_info.flags = 4;
a_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
}
}
src/d/actor/d_a_e_oc.cpp
+1 -1
View File
@@ -2552,7 +2552,7 @@ cPhs__Step daE_OC_c::create() {
lbl_216_bss_58 = 1;
l_HIO.field_0x04 = 0xFF;
}
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx());
fopAcM_SetMin(this, -200.0f, -200.0f, -200.0f);
fopAcM_SetMax(this, 200.0f, 200.0f, 200.0f);
src/d/actor/d_a_e_oct_bg.cpp
+4 -4
View File
@@ -288,7 +288,7 @@ void daE_OctBg_c::born_swim() {
field_0xb70++;
} else if (field_0xb70 == -1) {
field_0x8c0.SetTgType(0xd8fbfdff);
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
} else if (field_0xbae == 0) {
cLib_addCalcAngleS(&current.angle.x, 0, 0x10, 0xc00, 0x200);
cLib_chaseF(&speedF, 0.0f, 0.05f);
@@ -379,7 +379,7 @@ bool daE_OctBg_c::checkCoreFishAttack() {
if (fopAcM_SearchByID(fopAcM_GetLinkId(this), &actor) == 0 || actor == NULL) {
return false;
}
if (fopAcM_checkStatus(actor, 0x100000) == 0) {
if (fopAcM_CheckStatus(actor, 0x100000) == 0) {
return false;
}
return true;
@@ -594,7 +594,7 @@ void daE_OctBg_c::back_swim() {
bool daE_OctBg_c::setBombCarry(int param_1) {
fopAc_ac_c* actor = NULL;
if (param_1 == 0) {
cLib_onBit(attention_info.flags, 0x10UL);
cLib_onBit<u32>(attention_info.flags, fopAc_AttnFlag_CARRY_e);
if (fopAcM_checkCarryNow(this) != 0) {
current.angle.x = 0;
actor =
@@ -846,7 +846,7 @@ int daE_OctBg_c::create() {
field_0xbb3 = 1;
struct_8073A14C.field_0x04 = -1;
}
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
onWolfNoLock();
fopAcM_SetMtx(this, field_0x5b4->getModel()->getBaseTRMtx());
fopAcM_SetMin(this, -50.0f, -50.0f, -50.0f);
src/d/actor/d_a_e_ot.cpp
+2 -2
View File
@@ -339,7 +339,7 @@ void daE_OT_c::executeEgg() {
if (mWaterSurface >= current.pos.y) {
setWaterEffect();
}
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
if (mMode == 5) {
setActionMode(ACT_BORN, 0);
} else {
@@ -798,7 +798,7 @@ cPhs__Step daE_OT_c::create() {
l_HIO.field_0x4 = -1;
}
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx());
fopAcM_SetMin(this, -200.0f, -200.0f, -200.0f);
fopAcM_SetMax(this, 200.0f, 200.0f, 200.0f);
src/d/actor/d_a_e_ph.cpp
+2 -2
View File
@@ -1037,7 +1037,7 @@ void daE_PH_c::AttentionSet() {
attention_info.distances[fopAc_attn_BATTLE_e] = 0x53;
}
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
} else if (current.pos.absXZ(fopAcM_GetPosition(player_p)) > 1000.0f) {
if (strcmp(dComIfGp_getStartStageName(), "D_MN07A") == 0) {
attention_info.distances[fopAc_attn_BATTLE_e] = 0x52;
@@ -1257,7 +1257,7 @@ int daE_PH_c::create() {
mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir,
fopAcM_GetSpeed_p(this), NULL, NULL);
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
attention_info.distances[fopAc_attn_BATTLE_e] = 0x22;
cXyz sp3C(current.pos.x, current.pos.y + 200.0f, current.pos.z);
src/d/actor/d_a_e_pm.cpp
+2 -2
View File
@@ -1646,7 +1646,7 @@ void daE_PM_c::BossEscapeAction() {
case 3:
if (mpMorf->isStop()) {
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
mAction = ACT_WAIT;
mMode = 0;
if (mBossHealth < 3) {
@@ -2794,7 +2794,7 @@ cPhs__Step daE_PM_c::Create() {
mpPath = dPath_GetRoomPath(mPathIndex, fopAcM_GetRoomNo(this));
mSwBit = (fopAcM_GetParam(this) >> 0x18) & 0xFF;
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
attention_info.distances[fopAc_attn_BATTLE_e] = 86;
fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx());
fopAcM_SetMin(this, -200.0f, 0.0f, -200.0f);
src/d/actor/d_a_e_po.cpp
+14 -14
View File
@@ -362,7 +362,7 @@ static void e_po_avoid(e_po_class* i_this) {
anm_init(i_this, ANM_SWAY_BACK, 0.0f, 0, 1.0f);
i_this->mSound1.startCreatureVoice(Z2SE_EN_PO_V_LAUGH, -1);
i_this->enemy.current.angle.y = fopAcM_searchPlayerAngleY(a_this);
i_this->enemy.attention_info.flags &= ~0x4;
i_this->enemy.attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e;
if (cM_rndF(1.0f) < 0.5f) {
i_this->enemy.current.angle.y += 0x4000;
} else {
@@ -375,7 +375,7 @@ static void e_po_avoid(e_po_class* i_this) {
if (i_this->mpMorf->isStop()) {
i_this->mSound1.startCreatureVoice(Z2SE_EN_PO_V_FIND, -1);
i_this->enemy.current.angle.y = i_this->enemy.shape_angle.y;
i_this->enemy.attention_info.flags |= 0x4;
i_this->enemy.attention_info.flags |= fopAc_AttnFlag_BATTLE_e;
i_this->mActionID = ACT_SEARCH;
anm_init(i_this, ANM_RUN_AFTER2, 10.0f, 2, 1.0f);
i_this->mType = 2;
@@ -856,7 +856,7 @@ static void e_po_dead(e_po_class* i_this) {
} else {
camera_player->mCamera.Stop();
camera_player->mCamera.SetTrimSize(3);
a_this->attention_info.flags &= 0xFFBFFFFF;
a_this->attention_info.flags &= ~fopAc_AttnFlag_UNK_0x400000;
i_this->mType = 3;
}
@@ -949,7 +949,7 @@ static void e_po_dead(e_po_class* i_this) {
i_this->mSound1.startCreatureSound(Z2SE_EN_PO_SOUL_PULLOUT, 0, -1);
anm_init(i_this, ANM_DOWN_DEAD, 10.0f, 0, 1.0f);
fopAcM_OffStatus(a_this, 0);
a_this->attention_info.flags &= ~0x4;
a_this->attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e;
i_this->mCyl.SetTgHitMark(CcG_Tg_UNK_MARK_3);
dScnPly_c::setPauseTimer(5);
fopAcM_OnStatus(a_this, 0x4000);
@@ -961,7 +961,7 @@ static void e_po_dead(e_po_class* i_this) {
if (i_this->mpMorf->isStop()) {
i_this->field_0x75A = 1;
fopAcM_OffStatus(a_this, 0);
a_this->attention_info.flags &= ~0x4;
a_this->attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e;
a_this->attention_info.distances[fopAc_attn_BATTLE_e] = 0;
fopAcM_SetGroup(a_this, 0);
i_this->mpMorf3->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_PO", 0x17), 0, 0.0f,
@@ -1190,7 +1190,7 @@ static void e_po_dead(e_po_class* i_this) {
i_this->mSound1.setEnemyName(NULL);
fopAcM_SetGroup(a_this, 0);
fopAcM_OffStatus(a_this, 0);
a_this->attention_info.flags &= ~0x4;
a_this->attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e;
break;
case 20:
@@ -1254,7 +1254,7 @@ static void e_po_dead(e_po_class* i_this) {
} else {
camera_player->mCamera.Stop();
camera_player->mCamera.SetTrimSize(3);
a_this->attention_info.flags &= ~0x400000;
a_this->attention_info.flags &= ~fopAc_AttnFlag_UNK_0x400000;
i_this->mType = 3;
}
}
@@ -2202,7 +2202,7 @@ static void e_po_holl_demo(e_po_class* i_this) {
a_this->field_0x560 = 90;
i_this->mSph2.OnCoSetBit();
i_this->field_0x5C1 = 1;
a_this->attention_info.flags = 0x400000;
a_this->attention_info.flags = fopAc_AttnFlag_UNK_0x400000;
a_this->attention_info.distances[fopAc_attn_BATTLE_e] = 3;
fopAcM_SetGroup(a_this, 2);
a_this->home.pos.set(a_this->current.pos);
@@ -2478,9 +2478,9 @@ static void action(e_po_class* i_this) {
var_f31 = 230.0f;
var_f30 = 60.0f;
fopAcM_OnStatus(a_this, 0);
a_this->attention_info.flags |= 4;
a_this->attention_info.flags |= fopAc_AttnFlag_BATTLE_e;
if (i_this->field_0x5C1) {
a_this->attention_info.flags = 0x400004;
a_this->attention_info.flags = fopAc_AttnFlag_UNK_0x400000 | fopAc_AttnFlag_BATTLE_e;
}
if (i_this->mActionID == ACT_OPENING || i_this->mActionID == ACT_DAMAGE ||
i_this->mActionID == ACT_WOLF_BITE || i_this->mActionID == ACT_DEAD ||
@@ -2504,9 +2504,9 @@ static void action(e_po_class* i_this) {
i_this->field_0x74A[3] = 5;
i_this->field_0x754 = 10;
fopAcM_OffStatus(a_this, 0);
a_this->attention_info.flags &= ~0x4;
a_this->attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e;
if (i_this->field_0x5C1) {
a_this->attention_info.flags = 0x400000;
a_this->attention_info.flags = fopAc_AttnFlag_UNK_0x400000;
}
}
}
@@ -3020,7 +3020,7 @@ static int daE_PO_Create(fopAc_ac_c* i_act_this) {
i_act_this->attention_info.distances[fopAc_attn_BATTLE_e] = 25;
}
fopAcM_OffStatus(i_act_this, 0);
i_act_this->attention_info.flags &= ~0x4;
i_act_this->attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e;
if (mArg0Check(i_this, 0xFF) == 3 || mArg0Check(i_this, 0xFF) == 4) {
i_this->BitSW = 0xFF;
@@ -3151,7 +3151,7 @@ static int daE_PO_Create(fopAc_ac_c* i_act_this) {
i_this->field_0x5C1 = TRUE;
}
if (i_this->field_0x5C1) {
i_act_this->attention_info.flags = 0x400000;
i_act_this->attention_info.flags = fopAc_AttnFlag_UNK_0x400000;
}
if (mArg0Check(i_this, 0) != 0) {
if (!fopAcM_isSwitch(i_act_this, 0x43)) {
src/d/actor/d_a_e_pz.cpp
+5 -5
View File
@@ -178,7 +178,7 @@ void daE_PZ_c::mEntrySUB(bool param_0) {
attention_info.distances[fopAc_attn_BATTLE_e] = 0;
fopAcM_OffStatus(this, 0);
attention_info.flags &= ~4;
attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e;
} else {
if ((arg0 == 0 || arg0 == 1) && field_0x844 != 0) {
dComIfGp_particle_set(0x8897, &eff_pos, &shape_angle, NULL);
@@ -188,7 +188,7 @@ void daE_PZ_c::mEntrySUB(bool param_0) {
attention_info.distances[fopAc_attn_BATTLE_e] = 3;
fopAcM_OnStatus(this, 0);
attention_info.flags |= 4;
attention_info.flags |= fopAc_AttnFlag_BATTLE_e;
}
}
@@ -1606,7 +1606,7 @@ void daE_PZ_c::executeDead() {
field_0x843 = 0;
fopAcM_OffStatus(this, 0);
fopAcM_SetGroup(this, 0);
attention_info.flags &= ~4;
attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e;
break;
}
@@ -2568,7 +2568,7 @@ int daE_PZ_c::create() {
l_HIO.no = mDoHIO_CREATE_CHILD("ファントムザント", &l_HIO);
}
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
mColliderStts.Init(0xFE, 0, this);
@@ -2642,7 +2642,7 @@ int daE_PZ_c::create() {
attention_info.distances[fopAc_attn_BATTLE_e] = 0;
fopAcM_OffStatus(this, 0);
attention_info.flags &= ~4;
attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e;
if (arg0 == 0) {
field_0x7bc = 20.0f;
src/d/actor/d_a_e_rb.cpp
+2 -2
View File
@@ -482,7 +482,7 @@ static void action(e_rb_class* i_this) {
if (attention_ON) {
fopAcM_OnStatus(enemy, 0);
enemy->attention_info.flags = 4;
enemy->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
} else {
fopAcM_OffStatus(enemy, 0);
enemy->attention_info.flags = 0;
@@ -846,7 +846,7 @@ static int daE_RB_Create(fopAc_ac_c* i_this) {
l_HIO.id = mDoHIO_CREATE_CHILD("リーバ", &l_HIO);
}
i_this->attention_info.flags = 4;
i_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
fopAcM_SetMtx(i_this, a_this->modelMorf->getModel()->getBaseTRMtx());
i_this->health = 1;
i_this->field_0x560 = 1;
src/d/actor/d_a_e_rd.cpp
+3 -3
View File
@@ -3659,7 +3659,7 @@ static void e_rd_kiba_start(e_rd_class* i_this) {
if (i_this->mpModelMorf->isStop()) {
i_this->mAction = ACTION_WB_RUN;
i_this->mMode = 0;
a_this->attention_info.flags = 4;
a_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
}
}
}
@@ -6887,7 +6887,7 @@ static int daE_RD_Execute(e_rd_class* i_this) {
a_this->setHeadLockPos(&spd4);
demo_camera(i_this);
i_this->field_0x5bb = 1;
a_this->attention_info.flags |= 0x200000;
a_this->attention_info.flags |= fopAc_AttnFlag_UNK_0x200000;
return 1;
}
@@ -7282,7 +7282,7 @@ static cPhs__Step daE_RD_Create(fopAc_ac_c* a_this) {
}
fopAcM_OnStatus(a_this, fopAcM_STATUS_UNK_000100);
a_this->attention_info.flags = 4;
a_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
if (i_this->field_0x5b6 == 6) {
i_this->mAction = ACTION_YAGURA;
src/d/actor/d_a_e_rdb.cpp
+1 -1
View File
@@ -970,7 +970,7 @@ static void action(e_rdb_class* i_this) {
if (sVar2) {
fopAcM_OnStatus(a_this, 0);
a_this->attention_info.flags = 4;
a_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
} else {
fopAcM_OffStatus(a_this, 0);
a_this->attention_info.flags = 0;
src/d/actor/d_a_e_rdy.cpp
+2 -2
View File
@@ -3229,7 +3229,7 @@ static void action(e_rdy_class* i_this) {
if (i_this->mRideState == 0) {
fopAcM_OnStatus(a_this, 0);
a_this->attention_info.flags = 4;
a_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
} else {
fopAcM_OffStatus(a_this, 0);
a_this->attention_info.flags = 0;
@@ -4953,7 +4953,7 @@ static cPhs__Step daE_RDY_Create(fopAc_ac_c* i_this) {
}
fopAcM_OnStatus(i_this, fopAcStts_CULL_e);
i_this->attention_info.flags = 4;
i_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
u8 path_id = i_this->home.angle.x & 0xff;
if (path_id != 0xff) {
src/d/actor/d_a_e_s1.cpp
+3 -3
View File
@@ -1516,7 +1516,7 @@ static void action(e_s1_class* i_this) {
if (on_attention) {
fopAcM_OnStatus(a_this, 0);
i_this->attention_info.flags = 4;
i_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
} else {
fopAcM_OffStatus(a_this, 0);
i_this->attention_info.flags = 0;
@@ -2064,7 +2064,7 @@ static int daE_S1_Execute(e_s1_class* i_this) {
cXyz lockpos(a_this->eyePos);
lockpos.y += NREG_F(7) + 130.0f;
i_this->setHeadLockPos(&lockpos);
a_this->attention_info.flags |= 0x200000;
a_this->attention_info.flags |= fopAc_AttnFlag_UNK_0x200000;
return 1;
}
@@ -2214,7 +2214,7 @@ static int daE_S1_Create(fopAc_ac_c* i_this) {
}
fopAcM_OnStatus(i_this, 0x100);
i_this->attention_info.flags = 4;
i_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
if (!a_this->mRoofSpawn) {
a_this->mAction = ACT_WAIT;
src/d/actor/d_a_e_sb.cpp
+3 -3
View File
@@ -664,7 +664,7 @@ void daE_SB_c::Search() {
attention_info.flags = 0;
if (temp_f31 < l_HIO.search_area) {
if (!other_bg_check(this, player)) {
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
mSound.setLinkSearch(1);
field_0x5b0 = 4;
if (temp_f31 < l_HIO.atk_start_range && (s16) (shape_angle.y - s_TargetAngle) > -0x3000
@@ -677,7 +677,7 @@ void daE_SB_c::Search() {
}
} else if (temp_f31 < (400.0f + l_HIO.search_area)) {
if (!other_bg_check(this, player)) {
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
}
} else if (temp_f30 > l_HIO.distance_home) {
field_0x5b0 = 4;
@@ -1168,7 +1168,7 @@ cPhs__Step daE_SB_c::Create() {
l_HIO.field_0x04 = -1;
}
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
attention_info.distances[2] = 0x24;
fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx());
fopAcM_SetMin(this, -200.0f, 0.0f, -200.0f);
src/d/actor/d_a_e_sg.cpp
+4 -4
View File
@@ -703,7 +703,7 @@ static void e_sg_drop(e_sg_class* i_this) {
cXyz local_3c;
cXyz local_48;
if (fopAcM_checkStatus(i_this, 0x100000) == 0) {
if (fopAcM_CheckStatus(i_this, 0x100000) == 0) {
i_this->mStepSpeed = 1.2f;
if (i_this->mAcch.ChkGroundHit()) {
local_3c = i_this->home.pos - i_this->current.pos;
@@ -908,10 +908,10 @@ static void action(e_sg_class* i_this) {
if (att_flag) {
fopAcM_OnStatus(i_this, 0);
i_this->attention_info.flags = 0x4;
i_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
} else {
fopAcM_OffStatus(i_this, 0);
i_this->attention_info.flags = 0x0;
i_this->attention_info.flags = 0;
}
if (link_search_flag) {
@@ -1215,7 +1215,7 @@ static int daE_SG_Create(fopAc_ac_c* i_this) {
l_HIO.mUnk0 = -1;
}
a_this->attention_info.flags = 4;
a_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
fopAcM_SetMtx(a_this, a_this->mpModel->getBaseTRMtx());
src/d/actor/d_a_e_sm.cpp
+1 -1
View File
@@ -2019,7 +2019,7 @@ cPhs__Step daE_SM_c::Create() {
fopAcM_SetMtx(this, mpModelMorf->getModel()->getBaseTRMtx());
fopAcM_SetMin(this, -800.0f, -200.0f, -800.0f);
fopAcM_SetMax(this, 800.0f, 500.0f, 800.0f);
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
attention_info.distances[fopAc_attn_BATTLE_e] = 58;
mSound.init(&current.pos, NULL, 3, 1);
src/d/actor/d_a_e_sm2.cpp
+1 -1
View File
@@ -1040,7 +1040,7 @@ static void action(e_sm2_class* i_this) {
if (attn_ON) {
fopAcM_OnStatus(actor, 0);
actor->attention_info.flags = 4;
actor->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
} else {
fopAcM_OffStatus(actor, 0);
actor->attention_info.flags = 0;
src/d/actor/d_a_e_sw.cpp
+3 -3
View File
@@ -920,7 +920,7 @@ void daE_SW_c::executeHook() {
cLib_addCalcAngleS(&shape_angle.y, (s16)(field_0x6cc + field_0x6a4), 4, 0x1000, 0x100);
current.angle.y = shape_angle.y;
if (!fopAcM_checkStatus(this, 0x100000)) {
if (!fopAcM_CheckStatus(this, 0x100000)) {
setActionMode(7, 10);
}
break;
@@ -1754,7 +1754,7 @@ cPhs__Step daE_SW_c::create() {
l_HIO.field_0x4 = -1;
}
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
if (mpModelMorf != NULL) {
fopAcM_SetMtx(this, mpModelMorf->getModel()->getBaseTRMtx());
@@ -2673,7 +2673,7 @@ void daE_SW_c::d_hook() {
cLib_addCalcAngleS(&shape_angle.y, (s16)(field_0x6cc + field_0x6a4), 4, 0x1000, 0x100);
current.angle.y = shape_angle.y;
if (!fopAcM_checkStatus(this, 0x100000)) {
if (!fopAcM_CheckStatus(this, 0x100000)) {
speed.y = 20.0f;
speedF = -10.0f;
gravity = -5.0f;
src/d/actor/d_a_e_th.cpp
+1 -1
View File
@@ -642,7 +642,7 @@ static void action(e_th_class* i_this) {
if (on_attention) {
fopAcM_OnStatus(a_this, 0);
a_this->attention_info.flags = 4;
a_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
} else {
fopAcM_OffStatus(a_this, 0);
a_this->attention_info.flags = 0;
src/d/actor/d_a_e_tk.cpp
+2 -2
View File
@@ -647,7 +647,7 @@ static int daE_TK_Execute(e_tk_class* i_this) {
i_this->attention_info.flags = 0;
} else {
fopAcM_OnStatus(i_this, 0);
i_this->attention_info.flags = 4;
i_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
}
MTXCopy(model->getAnmMtx(2), *calc_mtx);
@@ -738,7 +738,7 @@ static int daE_TK_Create(fopAc_ac_c* i_this) {
hioInit = true;
l_HIO.field_0x04 = -1;
}
a_this->attention_info.flags = 4;
a_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
fopAcM_SetMtx(a_this, a_this->mpMorf->getModel()->getBaseTRMtx());
fopAcM_SetMin(a_this, -100.0f, -100.0f, -100.0f);
src/d/actor/d_a_e_tk2.cpp
+2 -2
View File
@@ -457,7 +457,7 @@ static int daE_TK2_Execute(e_tk2_class* i_this) {
i_this->attention_info.flags = 0;
} else {
fopAcM_OnStatus(i_this, 0);
i_this->attention_info.flags = 4;
i_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
}
MTXCopy(model->getAnmMtx(2), *calc_mtx);
@@ -540,7 +540,7 @@ static int daE_TK2_Create(fopAc_ac_c* i_this) {
l_HIO.field_0x04 = -1;
}
a_this->attention_info.flags = 4;
a_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
fopAcM_SetMtx(a_this, a_this->mpMorf->getModel()->getBaseTRMtx());
fopAcM_SetMin(a_this, -100.0f, -100.0f, -100.0f);
src/d/actor/d_a_e_tk_ball.cpp
+1 -1
View File
@@ -143,7 +143,7 @@ static void e_tk_ball_move(e_tk_ball_class* i_this) {
dAttention_c* attention = dComIfGp_getAttention();
if (attention->Lockon() && parent_actor == attention->LockonTarget(0)) {
actor_lockon = true;
parent_actor->attention_info.flags |= 0x200000;
parent_actor->attention_info.flags |= fopAc_AttnFlag_UNK_0x200000;
}
}
if (i_this->mTgSph.ChkTgHit() || i_this->mAtSph.ChkAtShieldHit()) {
src/d/actor/d_a_e_vt.cpp
+6 -6
View File
@@ -1796,7 +1796,7 @@ void daE_VA_c::executeClearWait() {
/* fallthrough */
case 0:
setBck(ANM_INVI_WAIT_e, J3DFrameCtrl::EMode_LOOP, 20.0f, 1.0f);
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
mMode = 2;
/* fallthrough */
case 2:
@@ -1902,7 +1902,7 @@ void daE_VA_c::executeTransWait() {
case 0:
Z2GetAudioMgr()->changeSubBgmStatus(2);
mAlphaType = 1;
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
speedF = 0.0f;
mMode = 1;
setBck(ANM_TRANS_WAIT_e, J3DFrameCtrl::EMode_LOOP, 10.0f, 1.0f);
@@ -2259,7 +2259,7 @@ void daE_VA_c::executeOpaciWait() {
mKankyoColBlend = 1.0f;
mKankyoColType = 1;
field_0x1354 = 10;
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
mFadeAwayTimer = l_HIO.mFadeAwayTime;
speedF = 0.0f;
@@ -2344,7 +2344,7 @@ void daE_VA_c::executeOpaciWait() {
dComIfGp_event_reset();
mFadeAwayTimer = l_HIO.mFadeAwayTime;
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
setBck(ANM_SUBS_WAIT_e, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
mMode = 15;
mDemoModeTimer = 30;
@@ -2653,7 +2653,7 @@ void daE_VA_c::executeOpaciChase() {
} else {
if (abs((s16)(field_0x1334 - field_0x1330)) <= abs(field_0x1336)) {
mMode = 12;
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
}
}
}
@@ -2776,7 +2776,7 @@ void daE_VA_c::executeOpaciDown() {
mMode = 2;
speedF = 0.0f;
field_0x1383 = 0;
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
mSound.startCreatureVoice(Z2SE_EN_VA_V_DMG_L, -1);
dComIfGs_onOneZoneSwitch(6, fopAcM_GetRoomNo(this));
/* fallthrough */

Some files were not shown because too many files have changed in this diff Show More