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

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

Browse Source
This commit is contained in:
TakaRikka
2024-03-04 17:33:13 -08:00
committed by GitHub
parent 1a421c4a4e
commit dede32dbc9
334 changed files with 3797 additions and 6195 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/a/d_a_alink.cpp
+41 -41
View File
@@ -12701,7 +12701,7 @@ void daAlink_c::playerInit() {
mAnmHeap9.createHeap(daPy_anmHeap_c::HEAP_TYPE_3);
resetBasAnime();
mZ2Link.init(&current.pos, &mEyePos, &field_0x3720);
mZ2Link.init(&current.pos, &eyePos, &field_0x3720);
mZ2Link.initKantera(&mKandelaarFlamePos);
mZ2Link.setKanteraState(0);
mProcID = 0x160;
@@ -12785,7 +12785,7 @@ void daAlink_c::playerInit() {
field_0x2f97 = -1;
for (int i = 0; i < 0x10; i++) {
field_0x28b0[i] = -1;
mShieldArrowIDs[i] = -1;
}
mAtnActorID = -1;
mMsgClassID = -1;
@@ -12908,16 +12908,16 @@ int daAlink_c::create() {
if ((!checkBossOctaIealRoom() && dComIfGs_Wolf_Change_Check() == 1) || startPoint == -4 ||
sceneMode == 9)
{
mAttentionInfo.mPosition.set(current.pos.x + cM_ssin(shape_angle.y) * 70.0f,
attention_info.position.set(current.pos.x + cM_ssin(shape_angle.y) * 70.0f,
current.pos.y + 80.0f,
current.pos.z + cM_scos(shape_angle.y) * 70.0f);
i_onNoResetFlg1(FLG1_IS_WOLF);
} else if (horseStart) {
mAttentionInfo.mPosition.y = current.pos.y + 150.0f;
attention_info.position.y = current.pos.y + 150.0f;
} else {
mAttentionInfo.mPosition.y = current.pos.y + 275.0f;
attention_info.position.y = current.pos.y + 275.0f;
}
mAttentionInfo.mFlags = -1;
attention_info.flags = -1;
if (!i_dComIfGp_getEventManager().dataLoaded()) {
return cPhs_INIT_e;
@@ -13089,7 +13089,7 @@ s32 daAlink_c::setRoomInfo() {
roomID = dComIfG_Bgsp().GetRoomId(mLinkAcch.m_gnd);
if (roomID != fopAcM_GetRoomNo(this)) {
mTevStr.mRoomNo = roomID;
tevStr.mRoomNo = roomID;
mVoiceReverbIntensity = dComIfGp_getReverb(roomID);
field_0x814.SetRoomId(roomID);
fopAcM_SetRoomNo(this, roomID);
@@ -13100,7 +13100,7 @@ s32 daAlink_c::setRoomInfo() {
roomID = fopAcM_GetRoomNo(this);
}
mTevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mLinkAcch.m_gnd);
tevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mLinkAcch.m_gnd);
field_0x3174 = dComIfG_Bgsp().GetGroundCode(mLinkAcch.m_gnd);
field_0x2fbb = dComIfG_Bgsp().GetPolyAtt0(mLinkAcch.m_gnd);
field_0x2fa8 = dComIfG_Bgsp().GetSpecialCode(mLinkAcch.m_gnd);
@@ -13726,7 +13726,7 @@ BOOL daAlink_c::checkNoCollisionCorret() {
(!strcmp(i_dComIfGp_getEventManager().getRunEventName(), "SCENE_EXIT") ||
(fopAcM_getTalkEventPartner(this) &&
fopAcM_getTalkEventPartner(this) == getMidnaActor()))) ||
mEvtInfo.i_checkCommandDoor())
eventInfo.i_checkCommandDoor())
{
return true;
}
@@ -13740,7 +13740,7 @@ void daAlink_c::decSwordBlur() {
m_swordBlur.field_0x14 = 0;
} else {
m_swordBlur.field_0x14 -= 10;
m_swordBlur.traceBlur(&current.pos, &next.pos, shape_angle.y - field_0x2fe6);
m_swordBlur.traceBlur(&current.pos, &old.pos, shape_angle.y - field_0x2fe6);
}
}
@@ -15062,7 +15062,7 @@ void daAlink_c::setPlayerPosAndAngle(cXyz const* p_pos, s16 i_angle, int param_2
if (checkEventRun() || param_2 != 0 || mSpecialMode != 0) {
if (p_pos != NULL) {
current.pos = *p_pos;
next.pos = current.pos;
old.pos = current.pos;
field_0x3798 = current.pos;
i_onEndResetFlg0(ERFLG0_UNK_800000);
i_onEndResetFlg2(ERFLG2_UNK_100);
@@ -15105,7 +15105,7 @@ void daAlink_c::setPlayerPosAndAngle(cXyz const* p_pos, csXyz const* p_angle) {
if (checkEventRun() || mSpecialMode != 0) {
if (p_pos != NULL) {
current.pos = *p_pos;
next.pos = current.pos;
old.pos = current.pos;
field_0x3798 = current.pos;
i_onEndResetFlg0(ERFLG0_UNK_800000);
i_onEndResetFlg2(ERFLG2_UNK_100);
@@ -15128,7 +15128,7 @@ void daAlink_c::setPlayerPosAndAngle(Mtx param_0) {
current.pos.x = param_0[0][3];
current.pos.y = param_0[1][3];
current.pos.z = param_0[2][3];
next.pos = current.pos;
old.pos = current.pos;
field_0x3798 = current.pos;
i_onEndResetFlg0(ERFLG0_UNK_800000);
i_onEndResetFlg2(ERFLG2_UNK_100);
@@ -15204,7 +15204,7 @@ void daAlink_c::setStickData() {
u32 demoMode = mDemo.getDemoMode();
if (checkDemoMoveMode(demoMode)) {
if (dDemo_c::m_object->getActor(mDemoActorId) != NULL) {
if (dDemo_c::m_object->getActor(demoActorID) != NULL) {
field_0x33a8 = 1.0f;
} else {
field_0x33a8 = mDemo.getStick();
@@ -15682,21 +15682,21 @@ BOOL daAlink_c::setTalkStatus() {
if (notTalk()) {
setDoStatus(0x90);
} else {
if (field_0x27f4->mAttentionInfo.mFlags & 0x2000000) {
if (field_0x27f4->attention_info.flags & 0x2000000) {
return 0;
}
if (field_0x27f4->mAttentionInfo.mFlags & 0x800000) {
if (field_0x27f4->attention_info.flags & 0x800000) {
setDoStatus(0x3B);
} else if (field_0x27f4->mAttentionInfo.mFlags & 0x20000000) {
} else if (field_0x27f4->attention_info.flags & 0x20000000) {
if (fopAcM_GetName(field_0x27f4) == PROC_OBJ_SSDRINK) {
setDoStatus(0x3C);
} else {
setDoStatus(8);
}
} else if (field_0x27f4->mAttentionInfo.mFlags & 0x40000000) {
} else if (field_0x27f4->attention_info.flags & 0x40000000) {
setDoStatus(0x80);
} else if (field_0x27f4->mAttentionInfo.mFlags & 0x8000000) {
} else if (field_0x27f4->attention_info.flags & 0x8000000) {
setDoStatus(0x1B);
} else {
setDoStatus(0x1C);
@@ -17332,8 +17332,8 @@ void daAlink_c::setSpecialGravity(f32 i_gravity, f32 i_speed, int i_offFlag) {
i_onNoResetFlg3(FLG3_UNK_4000);
}
mGravity = i_gravity;
mMaxFallSpeed = i_speed;
gravity = i_gravity;
maxFallSpeed = i_speed;
}
/* 800BB7A0-800BBD40 0B60E0 05A0+00 1/1 0/0 0/0 .text transAnimeProc__9daAlink_cFP4cXyzff
@@ -17505,14 +17505,14 @@ void daAlink_c::posMove() {
speed.y = -var_f31 * cM_ssin(var_r26);
} else if ((checkBootsOrArmorHeavy() && mProcID != PROC_DEAD) || mProcID == PROC_SWIM_DIVE)
{
speed.y += mGravity;
speed.y += gravity;
if (speed.y < mMaxFallSpeed) {
speed.y = mMaxFallSpeed;
if (speed.y < maxFallSpeed) {
speed.y = maxFallSpeed;
}
} else if (speed.y > daAlinkHIO_swim_c0::m.mMaxFloatUpSpeed) {
speed.y += mGravity;
} else if (speed.y < mMaxFallSpeed) {
speed.y += gravity;
} else if (speed.y < maxFallSpeed) {
speed.y += 1.0f;
} else {
if (checkZoraWearAbility() &&
@@ -17535,24 +17535,24 @@ void daAlink_c::posMove() {
if (checkHeavyStateOn(1, 1) && mProcID != PROC_SPINNER_READY &&
!i_checkNoResetFlg0(FLG0_UNDERWATER))
{
speed.y += mGravity * 2.25f;
speed.y += gravity * 2.25f;
if (speed.y < mMaxFallSpeed * 1.5f) {
speed.y = mMaxFallSpeed * 1.5f;
if (speed.y < maxFallSpeed * 1.5f) {
speed.y = maxFallSpeed * 1.5f;
}
} else {
speed.y += mGravity;
speed.y += gravity;
if (speed.y < mMaxFallSpeed) {
speed.y = mMaxFallSpeed;
if (speed.y < maxFallSpeed) {
speed.y = maxFallSpeed
}
}
} else if (checkBoardRide()) {
mLinkAcch.OffLineCheck();
speed.y += mGravity;
speed.y += gravity;
if (speed.y < mMaxFallSpeed) {
speed.y = mMaxFallSpeed;
if (speed.y < maxFallSpeed) {
speed.y = maxFallSpeed;
}
}
@@ -17587,7 +17587,7 @@ void daAlink_c::posMove() {
if (i_getSumouMode() && mProcID != PROC_SUMOU_WIN_LOSE) {
current.pos.y = var_f31 - 1.0f;
speed.y = mGravity;
speed.y = gravity;
}
field_0x342c = 0.0f;
@@ -18050,8 +18050,8 @@ int daAlink_c::checkSceneChange(int exitID) {
if (hStop->getActiveFlg()) {
fpoAcM_relativePos(hStop, &current.pos, &sp8);
if (sp8.y >= -200.0f && sp8.y <= hStop->mScale.y + 600.0f &&
fabsf(sp8.x) <= hStop->mScale.x && fabsf(sp8.z) <= hStop->mScale.z)
if (sp8.y >= -200.0f && sp8.y <= hStop->scale.y + 600.0f &&
fabsf(sp8.x) <= hStop->scale.x && fabsf(sp8.z) <= hStop->scale.z)
{
return 0;
}
@@ -18107,7 +18107,7 @@ int daAlink_c::checkSceneChange(int exitID) {
exitMode = 0;
}
if (mEvtInfo.i_checkCommandDoor() || mProcID == PROC_WARP || mProcID == WOLF_DIG ||
if (eventInfo.i_checkCommandDoor() || mProcID == PROC_WARP || mProcID == WOLF_DIG ||
mProcID == PROC_WOLF_DIG_THROUGH || field_0x3106 != 0 ||
dComIfGp_event_compulsory(this, NULL, -1))
{
@@ -18141,7 +18141,7 @@ int daAlink_c::checkSceneChange(int exitID) {
if (sceneChanged) {
i_onNoResetFlg0(FLG0_UNK_4000);
if (!mEvtInfo.i_checkCommandDoor()) {
if (!eventInfo.i_checkCommandDoor()) {
mDemo.setOriginalDemoType();
if (checkUpperReadyThrowAnime()) {
@@ -19162,7 +19162,7 @@ void daAlink_c::commonProcInit(daAlink_c::daAlink_PROC i_procID) {
if (temp_r31 &&
(mItemAcKeep.getActor() == NULL ||
mItemAcKeep.getActor()->mEvtInfo.i_checkCommandDemoAccrpt()) &&
mItemAcKeep.getActor()->eventInfo.i_checkCommandDemoAccrpt()) &&
!i_checkEndResetFlg0(ERFLG0_UNK_1000))
{
deleteEquipItem(0, 0);
src/d/a/d_a_alink_bottle.inc
+2 -2
View File
@@ -618,7 +618,7 @@ int daAlink_c::procBottleSwingInit(fopAc_ac_c* param_0, int param_1) {
BOOL temp_r3;
s16 temp_r30;
if (var_r31 != NULL) {
if (var_r31->mAttentionInfo.mPosition.y > field_0x3834.y - 30.0f) {
if (var_r31->attention_info.position.y > field_0x3834.y - 30.0f) {
temp_r3 = false;
} else {
temp_r3 = true;
@@ -697,7 +697,7 @@ int daAlink_c::procBottleSwing() {
daPy_frameCtrl_c* frameCtrl_p = mUnderFrameCtrl;
if (mProcVar2.field_0x300c == 0) {
if (mEvtInfo.i_checkCommandCatch()) {
if (eventInfo.i_checkCommandCatch()) {
if (mProcVar3.field_0x300e.x == 0) {
dComIfGp_getVibration().StartShock(1, 1, cXyz(0.0f, 1.0f, 0.0f));
mProcVar3.field_0x300e.x = 1;
src/d/a/d_a_alink_canoe.inc
+2 -2
View File
@@ -258,7 +258,7 @@ int daAlink_c::procCanoeRideInit() {
daAlinkHIO_wallCatch_c0::m.mClimbStartFrame,
daAlinkHIO_wallCatch_c0::m.mClimbAnm.mEndFrame,
daAlinkHIO_wallCatch_c0::m.mClimbAnm.mInterpolation);
setSpecialGravity(FLOAT_LABEL(lit_6108), mMaxFallSpeed, 0);
setSpecialGravity(FLOAT_LABEL(lit_6108), maxFallSpeed, 0);
f32 tmp_0 = FLOAT_LABEL(lit_6108);
mNormalSpeed = tmp_0;
@@ -330,7 +330,7 @@ int daAlink_c::procCanoeJumpRideInit(fopAc_ac_c* param_0) {
deleteEquipItem(0, 0);
mRideAcKeep.setData(canoe);
setSpecialGravity(FLOAT_LABEL(lit_6108), mMaxFallSpeed, 0);
setSpecialGravity(FLOAT_LABEL(lit_6108), maxFallSpeed, 0);
f32 tmp_0 = FLOAT_LABEL(lit_6108);
mNormalSpeed = tmp_0;
src/d/a/d_a_alink_cut.inc
+15 -15
View File
@@ -134,8 +134,8 @@ bool daAlink_c::checkCutFastReady() {
if (i_checkModeFlg(1) && !i_checkRideOn() && i_checkSwordGet() && i_checkModeFlg(4) &&
!i_checkModeFlg(0x40000) && mTargetedActor == NULL && checkEnemyGroup(target_p))
{
f32 xz_dist = target_p->mEyePos.abs2XZ(current.pos);
f32 y_dist = fabsf(target_p->mEyePos.y - current.pos.y);
f32 xz_dist = target_p->eyePos.abs2XZ(current.pos);
f32 y_dist = fabsf(target_p->eyePos.y - current.pos.y);
if ((xz_dist < 160000.0f && y_dist < 300.0f) ||
(i_checkNoResetFlg0(FLG0_UNK_1000000) && xz_dist < 202500.0f && y_dist < 350.0f))
@@ -751,19 +751,19 @@ void daAlink_c::setCutJumpSpeed(int i_airAt) {
}
if (mTargetedActor != NULL && !i_airAt) {
shape_angle.y = cLib_targetAngleY(&current.pos, &mTargetedActor->mEyePos);
cXyz targetPos(mTargetedActor->mEyePos.x - (cM_ssin(shape_angle.y) * 70.0f),
mTargetedActor->mEyePos.y + 50.0f,
mTargetedActor->mEyePos.z - (cM_scos(shape_angle.y) * 70.0f));
shape_angle.y = cLib_targetAngleY(&current.pos, &mTargetedActor->eyePos);
cXyz targetPos(mTargetedActor->eyePos.x - (cM_ssin(shape_angle.y) * 70.0f),
mTargetedActor->eyePos.y + 50.0f,
mTargetedActor->eyePos.z - (cM_scos(shape_angle.y) * 70.0f));
if (fopAcM_gc_c::gndCheck(&targetPos)) {
targetPos.y = fopAcM_gc_c::getGroundY();
} else {
targetPos.y = mTargetedActor->mEyePos.y;
targetPos.y = mTargetedActor->eyePos.y;
}
f32 dvar12 = speed.y + mGravity;
f32 dvar10 = 1.0f / mGravity;
f32 dvar12 = speed.y + gravity;
f32 dvar10 = 1.0f / gravity;
f32 fvar1 = targetPos.y - (current.pos.y - (dvar10 * (dvar12 * dvar12) * 0.5f));
if (fvar1 > 0.0f) {
@@ -1948,8 +1948,8 @@ int daAlink_c::procCutDownInit() {
speed.y *= 1.5f;
}
f32 var_f4 = speed.y + mGravity;
f32 var_f5 = 1.0f / mGravity;
f32 var_f4 = speed.y + gravity;
f32 var_f5 = 1.0f / gravity;
f32 temp_f1 = sp2C.y - (current.pos.y - var_f5 * (var_f4 * var_f4) * 0.5f);
if (temp_f1 > 0.0f) {
@@ -2128,7 +2128,7 @@ int daAlink_c::procCutHeadInit() {
commonProcInit(PROC_CUT_HEAD);
resetCombo(1);
setSingleAnimeParam(ANM_CUT_HEAD_JUMP, &daAlinkHIO_cutHead_c0::m.mJumpAnm);
setSpecialGravity(daAlinkHIO_cutHead_c0::m.mGravity, mMaxFallSpeed, 0);
setSpecialGravity(daAlinkHIO_cutHead_c0::m.mGravity, maxFallSpeed, 0);
cXyz sp2C;
if (enemy_p != NULL) {
@@ -2140,8 +2140,8 @@ int daAlink_c::procCutHeadInit() {
}
f32 fvar9 = cLib_minMaxLimit(sp2C.y, 30.0f, daAlinkHIO_cutHead_c0::m.mMaxHeight);
f32 fvar10 = JMAFastSqrt((fvar9 * -2.0f) / mGravity);
speed.y = fvar10 * -mGravity;
f32 fvar10 = JMAFastSqrt((fvar9 * -2.0f) / gravity);
speed.y = fvar10 * -gravity;
f32 fvar5 = sp2C.absXZ();
if (fvar5 > daAlinkHIO_cutHead_c0::m.mMaxDistance) {
@@ -2183,7 +2183,7 @@ int daAlink_c::procCutHead() {
f32 tmp_0 = FLOAT_LABEL(lit_6108);
mNormalSpeed = tmp_0;
speed.y = tmp_0;
setSpecialGravity(tmp_0, mMaxFallSpeed, 0);
setSpecialGravity(tmp_0, maxFallSpeed, 0);
mProcVar3.field_0x300e.x = 1;
setCutWaterDropEffect();
setSwordVoiceSe(Z2SE_AL_V_KABUTO_ATK);
src/d/a/d_a_alink_demo.inc
+38 -38
View File
@@ -560,7 +560,7 @@ void daAlink_c::setDemoData() {
mMidnaTalkDelayTimer--;
}
} else {
dDemo_actor_c* demo_actor_p = dDemo_c::getActor(mDemoActorId);
dDemo_actor_c* demo_actor_p = dDemo_c::getActor(demoActorID);
cXyz* pos_p = NULL;
s16 angle;
u32 demo_mode = 1;
@@ -731,7 +731,7 @@ void daAlink_c::setDemoData() {
if (mDemo.getTimer() != 0) {
mDemo.decTimer();
cXyz tmp_sp = current.pos - orig.pos;
cXyz tmp_sp = current.pos - home.pos;
if (tmp_sp.abs2XZ() > 90000.0f) {
mDemo.setTimer(0);
dComIfGp_evmng_cutEnd(field_0x3184);
@@ -1101,7 +1101,7 @@ void daAlink_c::setShapeAngleToTalkActor() {
{
s16 target;
if (partner_name == PROC_Tag_Mhint || partner_name == PROC_Tag_Mstop) {
target = cLib_targetAngleY(&current.pos, &partner_p->mEyePos);
target = cLib_targetAngleY(&current.pos, &partner_p->eyePos);
} else {
target = fopAcM_searchActorAngleY(this, partner_p);
}
@@ -1137,7 +1137,7 @@ u8 daAlink_c::setTradeItemAnime() {
}
u32 partner_id = fopAcM_createItemForPresentDemo(
&current.pos, item_no, 3, -1, fopAcM_GetRoomNo(this), &shape_angle, &mScale);
&current.pos, item_no, 3, -1, fopAcM_GetRoomNo(this), &shape_angle, &scale);
dComIfGp_event_setItemPartnerId(partner_id);
}
@@ -1253,7 +1253,7 @@ void daAlink_c::setDemoBodyBck(dDemo_actor_c* param_0, u16 param_1) {
mNowAnmPackUnder[0].setAnmTransform(bck);
mNowAnmPackUpper[0].setAnmTransform(bck);
dDemo_actor_c* demo_actor_p = dDemo_c::getActor(mDemoActorId);
dDemo_actor_c* demo_actor_p = dDemo_c::getActor(demoActorID);
if (demo_actor_p->checkEnable(0x80)) {
field_0x2060->initOldFrameMorf(demo_actor_p->getPrm_Morf(), 0, field_0x30c6);
}
@@ -1402,7 +1402,7 @@ asm void daAlink_c::setDemoBrk(J3DAnmTevRegKey** param_0, J3DModel* param_1, u16
#ifdef NONMATCHING
f32 daAlink_c::setStickAnmData(J3DAnmBase* i_anm, int param_1, int param_2, u16 param_3,
int param_4) {
dDemo_actor_c* demo_actor_p = dDemo_c::getActor(mDemoActorId);
dDemo_actor_c* demo_actor_p = dDemo_c::getActor(demoActorID);
f32 var_f31;
if (i_anm != NULL) {
@@ -1540,7 +1540,7 @@ int daAlink_c::procCoToolDemoInit() {
// matches with literals
#ifdef NONMATCHING
int daAlink_c::procCoToolDemo() {
dDemo_actor_c* demo_actor_p = dDemo_c::getActor(mDemoActorId);
dDemo_actor_c* demo_actor_p = dDemo_c::getActor(demoActorID);
BOOL var_r29 = 0;
i_onEndResetFlg1(ERFLG1_GANON_FINISH);
@@ -1622,7 +1622,7 @@ int daAlink_c::procCoToolDemo() {
mProcVar2.field_0x300c = 2;
} else {
field_0x3484 = 0.0f;
mTevStr.field_0x344 = 0.0f;
tevStr.field_0x344 = 0.0f;
field_0x347c = -0.5f;
if (i_checkWolf()) {
@@ -2697,7 +2697,7 @@ int daAlink_c::procCoLookWait() {
if (look_actor_p != NULL) {
s16 target_angle;
s16 svar1 = cLib_targetAngleY(&field_0x34e0, &look_actor_p->mEyePos) - shape_angle.y;
s16 svar1 = cLib_targetAngleY(&field_0x34e0, &look_actor_p->eyePos) - shape_angle.y;
if (svar1 > 0x6000) {
target_angle = shape_angle.y + 0x6000;
@@ -2783,7 +2783,7 @@ int daAlink_c::procMonkeyMoveInit() {
}
current.angle.y = shape_angle.y;
setSpecialGravity(FLOAT_LABEL(lit_6108), mMaxFallSpeed, 0);
setSpecialGravity(FLOAT_LABEL(lit_6108), maxFallSpeed, 0);
f32 tmp_0 = FLOAT_LABEL(lit_6108);
speed.y = tmp_0;
@@ -3150,7 +3150,7 @@ int daAlink_c::procCoCaughtInit() {
f32 tmp_0 = FLOAT_LABEL(lit_6108);
mNormalSpeed = tmp_0;
speed.y = tmp_0;
setSpecialGravity(tmp_0, mMaxFallSpeed, 0);
setSpecialGravity(tmp_0, maxFallSpeed, 0);
mBodyAngle.z = 0;
return 1;
}
@@ -3572,7 +3572,7 @@ int daAlink_c::procCoTwGateInit() {
field_0x33b0 = field_0x3588.y;
mNormalSpeed = 0.0f;
setSpecialGravity(0.0f, mMaxFallSpeed, 0);
setSpecialGravity(0.0f, maxFallSpeed, 0);
speed.y = 0.0f;
return 1;
}
@@ -3683,7 +3683,7 @@ int daAlink_c::procZoraMoveInit() {
f32 tmp_0 = FLOAT_LABEL(lit_6108);
speed.y = tmp_0;
mNormalSpeed = tmp_0;
setSpecialGravity(tmp_0, mMaxFallSpeed, 0);
setSpecialGravity(tmp_0, maxFallSpeed, 0);
deleteEquipItem(FALSE, TRUE);
mProcVar3.field_0x300e.y = 5000;
@@ -3928,7 +3928,7 @@ asm int daAlink_c::procNotUseItemInit(int param_0) {
int daAlink_c::procNotUseItem() {
if (mProcVar2.field_0x300c == 0) {
u32 item_partner_id = fopAcM_createItemForPresentDemo(
&current.pos, field_0x3198, 5, -1, fopAcM_GetRoomNo(this), &shape_angle, &mScale);
&current.pos, field_0x3198, 5, -1, fopAcM_GetRoomNo(this), &shape_angle, &scale);
dComIfGp_event_setItemPartnerId(item_partner_id);
mProcVar2.field_0x300c = 1;
}
@@ -4232,7 +4232,7 @@ int daAlink_c::procDungeonWarpInit() {
mProcVar2.field_0x300c = 0;
mProcVar3.field_0x300e.z = 0;
setSpecialGravity(FLOAT_LABEL(lit_6108), mMaxFallSpeed, 0);
setSpecialGravity(FLOAT_LABEL(lit_6108), maxFallSpeed, 0);
mProcVar3.field_0x300e.x = 0;
mProcVar3.field_0x300e.y = 0;
@@ -4253,21 +4253,21 @@ int daAlink_c::procDungeonWarp() {
f32 sin = cM_ssin(mProcVar2.field_0x300c);
shape_angle.y += (s16)(14336.0f * sin);
mProcVar3.field_0x300e.x = 8.0f * sin + 24.0f * (1.0f - mScale.x);
mProcVar3.field_0x300e.x = 8.0f * sin + 24.0f * (1.0f - scale.x);
if (mProcVar3.field_0x300e.z != 0) {
return 1;
} else {
if (mProcVar2.field_0x300c == 0x4000) {
if (mProcVar3.field_0x300e.y == 0) {
dComIfGp_particle_set(0xA61, &current.pos, &mTevStr, NULL, NULL);
dComIfGp_particle_set(0xA61, &current.pos, &tevStr, NULL, NULL);
mProcVar3.field_0x300e.y = 1;
}
cLib_addCalc(&mScale.x, 0.0f, 0.5f, 0.4f, 0.005f);
cLib_addCalc(&mScale.y, 2.5f, 0.5f, 0.5f, 0.1f);
cLib_addCalc(&scale.x, 0.0f, 0.5f, 0.4f, 0.005f);
cLib_addCalc(&scale.y, 2.5f, 0.5f, 0.5f, 0.1f);
if (mScale.x < 0.01f) {
if (scale.x < 0.01f) {
i_onNoResetFlg0(FLG0_UNK_8000000);
if (checkItemGet(DUNGEON_EXIT, 1)) {
int escape =
@@ -4282,13 +4282,13 @@ int daAlink_c::procDungeonWarp() {
mProcVar3.field_0x300e.z = 1;
}
current.pos.y += 5.0f;
field_0x2b98 = (1.0f - mScale.y) * 100.0f;
field_0x2b98 = (1.0f - scale.y) * 100.0f;
} else if (mProcVar2.field_0x300c >= 0x2000) {
cLib_chaseF(&mScale.x, 0.8f, 0.01f);
cLib_chaseF(&scale.x, 0.8f, 0.01f);
}
mScale.z = mScale.x;
mpLinkModel->setBaseScale(mScale);
scale.z = scale.x;
mpLinkModel->setBaseScale(scale);
}
return 1;
@@ -4311,7 +4311,7 @@ asm int daAlink_c::procDungeonWarp() {
int daAlink_c::procDungeonWarpSceneStartInit() {
commonProcInit(PROC_DUNGEON_WARP_SCN_START);
setSpecialGravity(0.0f, mMaxFallSpeed, 0);
setSpecialGravity(0.0f, maxFallSpeed, 0);
setSingleAnimeBaseSpeed(ANM_WAIT, daAlinkHIO_move_c0::m.mWaitAnmSpeed,
daAlinkHIO_basic_c0::m.mAnmBlendFactor);
@@ -4326,8 +4326,8 @@ int daAlink_c::procDungeonWarpSceneStartInit() {
current.pos.y += 120.0f;
shape_angle.y += 0x7F7A;
mScale.set(0.0f, 1.5f, 0.0f);
mpLinkModel->setBaseScale(mScale);
scale.set(0.0f, 1.5f, 0.0f);
mpLinkModel->setBaseScale(scale);
return 1;
}
#else
@@ -4354,10 +4354,10 @@ int daAlink_c::procDungeonWarpSceneStart() {
return 1;
}
BOOL var_r31 = cLib_chaseF(&mScale.x, 1.0f, 0.05f);
mScale.z = mScale.x;
cLib_chaseF(&mScale.y, 1.0f, 0.025f);
mpLinkModel->setBaseScale(mScale);
BOOL var_r31 = cLib_chaseF(&scale.x, 1.0f, 0.05f);
scale.z = scale.x;
cLib_chaseF(&scale.y, 1.0f, 0.025f);
mpLinkModel->setBaseScale(scale);
if (!var_r31) {
current.pos.y -= 5.0f;
@@ -4372,7 +4372,7 @@ int daAlink_c::procDungeonWarpSceneStart() {
f32 sin = cM_ssin(mProcVar2.field_0x300c);
shape_angle.y += (s16)(sin * 14336.0f);
mProcVar3.field_0x300e.x = (sin * 8.0f) + ((1.0f - mScale.x) * 24.0f);
mProcVar3.field_0x300e.x = (sin * 8.0f) + ((1.0f - scale.x) * 24.0f);
return 1;
}
#else
@@ -4497,16 +4497,16 @@ void daAlink_c::checkWarpStart() {
const char* portal;
if (!i_checkMidnaRide()) {
if (dComIfGp_TargetWarpPt_get() == 3) {
mEvtInfo.setArchiveName("Obj_kbrg");
eventInfo.setArchiveName("Obj_kbrg");
portal = kBridgePortal;
} else if (dComIfGp_TargetWarpPt_get() == 6) {
mEvtInfo.setArchiveName("Obj_obrg");
eventInfo.setArchiveName("Obj_obrg");
portal = oBridgePortal;
} else if (dComIfGp_TargetWarpPt_get() == 9) {
mEvtInfo.setArchiveName("M_VolcBom");
eventInfo.setArchiveName("M_VolcBom");
portal = volcBomPortal;
} else if (dComIfGp_TargetWarpPt_get() == 8) {
mEvtInfo.setArchiveName("SCanCrs");
eventInfo.setArchiveName("SCanCrs");
portal = cannonPortal;
} else {
portal = defaultPortal;
@@ -4642,7 +4642,7 @@ int daAlink_c::procCoWarpInit(int param_0, int param_1) {
field_0x3484 = 0.0f;
if (!mLinkAcch.ChkGroundHit()) {
setSpecialGravity(0.0f, mMaxFallSpeed, 0);
setSpecialGravity(0.0f, maxFallSpeed, 0);
mProcVar1.field_0x300a = 1;
}
@@ -4686,7 +4686,7 @@ int daAlink_c::procCoWarp() {
var_f1 = daAlinkHIO_autoJump_c0::m.mGravity;
}
setSpecialGravity(var_f1, mMaxFallSpeed, 1);
setSpecialGravity(var_f1, maxFallSpeed, 1);
}
if (mDemo.getDemoMode() == 0x2D) {
src/d/a/d_a_alink_effect.inc
+5 -5
View File
@@ -12,7 +12,7 @@
// matches with literal
#ifdef NONMATCHING
void daAlink_c::setEmitter(u32* param_0, u16 param_1, cXyz const* param_2, csXyz const* param_3) {
*param_0 = dComIfGp_particle_set(*param_0, param_1, param_2, &mTevStr, param_3, NULL, 0xFF,
*param_0 = dComIfGp_particle_set(*param_0, param_1, param_2, &tevStr, param_3, NULL, 0xFF,
NULL, 0xFF, NULL, NULL, NULL);
dComIfGp_particle_levelEmitterOnEventMove(*param_0);
dComIfGp_particle_getEmitter(*param_0);
@@ -33,7 +33,7 @@ asm JPABaseEmitter* daAlink_c::setEmitter(u32* param_0, u16 param_1, cXyz const*
* setEmitterPolyColor__9daAlink_cFPUlUsR13cBgS_PolyInfoPC4cXyzPC5csXyz */
JPABaseEmitter* daAlink_c::setEmitterPolyColor(u32* param_0, u16 param_1, cBgS_PolyInfo& param_2,
cXyz const* param_3, csXyz const* param_4) {
*param_0 = dComIfGp_particle_setPolyColor(*param_0, param_1, param_2, param_3, &mTevStr,
*param_0 = dComIfGp_particle_setPolyColor(*param_0, param_1, param_2, param_3, &tevStr,
param_4, NULL, 0, NULL, -1, NULL);
dComIfGp_particle_levelEmitterOnEventMove(*param_0);
@@ -44,7 +44,7 @@ JPABaseEmitter* daAlink_c::setEmitterPolyColor(u32* param_0, u16 param_1, cBgS_P
* setEmitterColor__9daAlink_cFPUlUsPC4cXyzPC5csXyz */
JPABaseEmitter* daAlink_c::setEmitterColor(u32* param_0, u16 param_1, cXyz const* param_2,
csXyz const* param_3) {
*param_0 = dComIfGp_particle_setColor(*param_0, param_1, param_2, &mTevStr, NULL, NULL,
*param_0 = dComIfGp_particle_setColor(*param_0, param_1, param_2, &tevStr, NULL, NULL,
FLOAT_LABEL(lit_6108), -1, param_3, NULL, NULL, -1, NULL);
dComIfGp_particle_levelEmitterOnEventMove(*param_0);
@@ -361,7 +361,7 @@ void daAlink_c::setCutWaterDropEffect() {
if (field_0x32c0[0] > 0) {
cXyz sp18;
mDoMtx_multVecZero(mpLinkModel->i_getAnmMtx(1), &sp18);
dComIfGp_particle_setColor(0x2A4, &sp18, &mTevStr, NULL, NULL, FLOAT_LABEL(lit_6108), -1,
dComIfGp_particle_setColor(0x2A4, &sp18, &tevStr, NULL, NULL, FLOAT_LABEL(lit_6108), -1,
&shape_angle, NULL, NULL, -1, NULL);
}
}
@@ -557,7 +557,7 @@ void daAlink_c::clearWoodShieldBurnEffect() {
void daAlink_c::setWoodShieldBurnOutEffect() {
for (int i = 0; i < 2; i++) {
JPABaseEmitter* emitter = dComIfGp_particle_setColor(
effName_42340[i], &current.pos, &mTevStr, NULL, NULL, FLOAT_LABEL(lit_6108), -1);
effName_42340[i], &current.pos, &tevStr, NULL, NULL, FLOAT_LABEL(lit_6108), -1);
if (emitter != NULL) {
emitter->setGlobalRTMatrix(mShieldModel->getBaseTRMtx());
src/d/a/d_a_alink_guard.inc
+189 -29
View File
@@ -3,33 +3,54 @@
* Player Shield action handling
*/
#include "d/a/d_a_alink.h"
#include "d/com/d_com_inf_game.h"
/* 800DC548-800DC5A4 0D6E88 005C+00 13/13 0/0 0/0 .text checkEnemyGroup__9daAlink_cFP10fopAc_ac_c
*/
BOOL daAlink_c::checkEnemyGroup(fopAc_ac_c* i_actor) {
return i_actor != NULL && (fopAcM_GetGroup(i_actor) == 2 || fopAcM_GetName(i_actor) == PROC_E_ZH || checkSpecialNpc(i_actor));
return i_actor != NULL && (fopAcM_GetGroup(i_actor) == fopAc_ENEMY_e ||
fopAcM_GetName(i_actor) == PROC_E_ZH || checkSpecialNpc(i_actor));
}
// properly setup later
class daNpc_Kn_c : public fopAc_ac_c {
public:
bool checkBattleMode() { return true; }
};
class daObj_GrA_c : public fopAc_ac_c {
public:
bool checkNpcObjGra() { return field_0xa7e == 1; }
u8 temp[0xA7E - 0x568];
u8 field_0xa7e;
};
/* 800DC5A4-800DC5DC 0D6EE4 0038+00 4/4 0/0 0/0 .text checkSpecialNpc__9daAlink_cFP10fopAc_ac_c */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm BOOL daAlink_c::checkSpecialNpc(fopAc_ac_c* param_0) {
nofralloc
#include "asm/d/a/d_a_alink/checkSpecialNpc__9daAlink_cFP10fopAc_ac_c.s"
BOOL daAlink_c::checkSpecialNpc(fopAc_ac_c* i_actor) {
s16 name = fopAcM_GetName(i_actor);
return ((name == PROC_NPC_KAKASHI || name == PROC_NPC_KN) &&
static_cast<daNpc_Kn_c*>(i_actor)->checkBattleMode()) ||
(name == PROC_OBJ_GRA && !static_cast<daObj_GrA_c*>(i_actor)->checkNpcObjGra());
}
#pragma pop
/* 800DC5DC-800DC678 0D6F1C 009C+00 1/1 0/0 0/0 .text checkShieldAttackEmphasys__9daAlink_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm bool daAlink_c::checkShieldAttackEmphasys() {
nofralloc
#include "asm/d/a/d_a_alink/checkShieldAttackEmphasys__9daAlink_cFv.s"
BOOL daAlink_c::checkShieldAttackEmphasys() {
return mTargetedActor != NULL && (mTargetedActor->attention_info.flags & 0x200000) &&
!checkCutHeadState() &&
(fopAcM_GetGroup(mTargetedActor) != fopAc_ENEMY_e ||
!static_cast<fopEn_enemy_c*>(mTargetedActor)->checkDownFlg());
}
#pragma pop
/* 800DC678-800DC79C 0D6FB8 0124+00 5/5 0/0 0/0 .text checkGuardActionChange__9daAlink_cFv */
/* BOOL daAlink_c::checkGuardActionChange() {
return i_checkAttentionLock() && !checkIronBallWaitAnime() && !checkGrabAnime() &&
!checkCopyRodControllAnime() && mTargetedActor != NULL && !checkSpecialNpc(mTargetedActor) &&
(fopAcM_GetGroup(mTargetedActor) != 3 && fopAcM_GetGroup(mTargetedActor) != fopAc_NPC_e);
} */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
@@ -41,6 +62,38 @@ asm BOOL daAlink_c::checkGuardActionChange() {
/* 800DC79C-800DC8C4 0D70DC 0128+00 3/3 0/0 0/0 .text stickArrowIncrement__9daAlink_cFi
*/
// matches with literals
#ifdef NONMATCHING
void daAlink_c::stickArrowIncrement(int param_0) {
if (!i_checkNoResetFlg2(FLG2_STATUS_WINDOW_DRAW)) {
s16 arrow_num = 0;
for (int i = 0; i < 16; i++) {
if (mShieldArrowIDs[i] != -1) {
if (field_0x2f7c[i] == 0 || param_0) {
arrow_num++;
mShieldArrowIDs[i] = -1;
field_0x2f7c[i] = 0;
} else {
field_0x2f7c[i]--;
}
}
}
if (arrow_num != 0) {
if (i_checkShieldGet() && checkItemGet(BOW, true)) {
int arrow_type = arrow_num == 1 ? ARROW_1 : ARROW_10;
dComIfGp_setItemArrowNumCount(arrow_num);
fopAcM_createItemForSimpleDemo(&current.pos, arrow_type, -1, NULL, NULL, 0.0f,
0.0f);
}
i_onResetFlg0(RFLG0_UNK_1);
}
}
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
@@ -49,9 +102,48 @@ asm void daAlink_c::stickArrowIncrement(int param_0) {
#include "asm/d/a/d_a_alink/stickArrowIncrement__9daAlink_cFi.s"
}
#pragma pop
#endif
/* 800DC8C4-800DCA2C 0D7204 0168+00 0/0 0/0 1/1 .text
* setArrowShieldActor__9daAlink_cFP10fopAc_ac_ci */
// matches with literals
#ifdef NONMATCHING
void daAlink_c::setArrowShieldActor(fopAc_ac_c* i_actor, int param_1) {
unsigned int new_arrow_id = fopAcM_GetID(i_actor);
int arrow_num = 0;
for (; arrow_num < 16; arrow_num++) {
if (mShieldArrowIDs[arrow_num] == -1) {
mShieldArrowIDs[arrow_num] = new_arrow_id;
field_0x2f7c[arrow_num] = 10;
break;
}
}
if (arrow_num == 16) {
fopAc_ac_c* first_arrow = fopAcM_SearchByID(mShieldArrowIDs[0]);
if (first_arrow != NULL) {
fopAcM_delete(first_arrow);
}
int i = 0;
for (; i < 15; i++) {
mShieldArrowIDs[i] = mShieldArrowIDs[i + 1];
field_0x2f7c[i] = field_0x2f7c[i + 1];
}
mShieldArrowIDs[i] = new_arrow_id;
field_0x2f7c[i] = 10;
dComIfGp_setItemArrowNumCount(1);
fopAcM_createItemForSimpleDemo(&current.pos, ARROW_10, -1, NULL, NULL, 0.0f, 0.0f);
}
if (param_1 && field_0x2fcb == 0 && !checkMagicArmorNoDamage()) {
field_0x2fcb = 120;
}
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
@@ -60,6 +152,7 @@ asm void daAlink_c::setArrowShieldActor(fopAc_ac_c* param_0, int param_1) {
#include "asm/d/a/d_a_alink/setArrowShieldActor__9daAlink_cFP10fopAc_ac_ci.s"
}
#pragma pop
#endif
/* 800DCA2C-800DCA80 0D736C 0054+00 1/1 0/0 2/2 .text
* checkWoodShieldEquipNotIronBall__9daAlink_cCFv */
@@ -69,6 +162,36 @@ BOOL daAlink_c::checkWoodShieldEquipNotIronBall() const {
/* 800DCA80-800DCD74 0D73C0 02F4+00 0/0 0/0 1/1 .text
* getArrowShieldOffset__9daAlink_cCFPC4cXyzPC5csXyzP4cXyzP4cXyz */
// matches with literals
#ifdef NONMATCHING
void daAlink_c::getArrowShieldOffset(cXyz const* param_0, csXyz const* param_1, cXyz* param_2,
cXyz* param_3) const {
cXyz sp54;
mDoMtx_stack_c::ZXYrotS(param_1->x + cM_rndFX(0x1000), param_1->y + cM_rndFX(0x1000), 0);
mDoMtx_stack_c::multVec(&cXyz::BaseZ, &sp54);
mDoMtx_stack_c::copy(getShieldMtx());
mDoMtx_stack_c::inverse();
mDoMtx_stack_c::multVecSR(&sp54, param_3);
cXyz sp60;
mDoMtx_multVec(getShieldMtx(), &localCenter, &sp60);
cM3dGPla plane(&field_0x351c, -field_0x351c.inprod(sp60));
cXyz sp6C;
cXyz sp78 = *param_0 + sp54;
plane.crossInfLin(*param_0, sp78, sp6C);
if (sp6C.abs(sp60) > 20.0f) {
sp6C = sp6C - sp60;
sp6C.normalize();
sp6C *= 20.0f;
sp6C += sp60;
}
mDoMtx_stack_c::multVec(&sp6C, param_2);
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
@@ -78,6 +201,7 @@ asm void daAlink_c::getArrowShieldOffset(cXyz const* param_0, csXyz const* param
#include "asm/d/a/d_a_alink/getArrowShieldOffset__9daAlink_cCFPC4cXyzPC5csXyzP4cXyzP4cXyz.s"
}
#pragma pop
#endif
/* 800DCD74-800DCDF0 0D76B4 007C+00 0/0 0/0 2/2 .text
* setArrowShieldPos__9daAlink_cCFP4cXyzP5csXyzPC4cXyzPC4cXyz */
@@ -94,14 +218,15 @@ void daAlink_c::setArrowShieldPos(cXyz* param_0, csXyz* param_1, cXyz const* par
/* 800DCDF0-800DCE6C 0D7730 007C+00 17/17 0/0 0/0 .text checkUpperGuardAnime__9daAlink_cCFv */
BOOL daAlink_c::checkUpperGuardAnime() const {
return i_checkNoResetFlg2(FLG2_UNK_8000000) && !checkEventRun() && !i_checkNoResetFlg0(FLG0_UNK_2) &&
mProcID != PROC_GUARD_BREAK && mProcID != PROC_CUT_REVERSE && mProcID != PROC_GUARD_ATTACK;
return i_checkNoResetFlg2(FLG2_UNK_8000000) && !checkEventRun() &&
!i_checkNoResetFlg0(FLG0_UNK_2) && mProcID != PROC_GUARD_BREAK &&
mProcID != PROC_CUT_REVERSE && mProcID != PROC_GUARD_ATTACK;
}
/* 800DCE6C-800DCF04 0D77AC 0098+00 1/0 0/0 0/0 .text checkPlayerGuard__9daAlink_cCFv */
BOOL daAlink_c::checkPlayerGuard() const {
return (i_checkSmallUpperGuardAnime() || (i_checkShieldGet() && checkHorseLieAnime())) ||
checkUpperGuardAnime();
checkUpperGuardAnime();
}
/* 800DCF04-800DCF64 0D7844 0060+00 5/5 0/0 0/0 .text checkPlayerGuardAndAttack__9daAlink_cCFv */
@@ -111,7 +236,8 @@ BOOL daAlink_c::checkPlayerGuardAndAttack() const {
/* 800DCF64-800DD008 0D78A4 00A4+00 2/2 0/0 0/0 .text checkGuardAccept__9daAlink_cFv */
BOOL daAlink_c::checkGuardAccept() {
return i_checkModeFlg(0x80) && i_checkShieldGet() && !i_checkFmChainGrabAnime() && !checkNotBattleStage();
return i_checkModeFlg(0x80) && i_checkShieldGet() && !i_checkFmChainGrabAnime() &&
!checkNotBattleStage();
}
/* 800DD008-800DD018 0D7948 0010+00 11/11 0/0 0/0 .text setUpperGuardAnime__9daAlink_cFf
@@ -124,9 +250,10 @@ void daAlink_c::setUpperGuardAnime(f32) {
void daAlink_c::setShieldGuard() {
if ((mProcID == PROC_GUARD_SLIP && mEquipItem != IRONBALL) || i_checkSmallUpperGuardAnime() ||
(checkGuardAccept() && !checkGrabAnime() && !checkUpperReadyThrowAnime() &&
!checkDkCaught2Anime() && !checkKandelaarSwingAnime() && !checkCutDashAnime() &&
!checkCutDashChargeAnime() && (!checkEquipAnime() || checkUpperGuardAnime()) &&
!i_checkRideOn() && checkGuardActionChange())) {
!checkDkCaught2Anime() && !checkKandelaarSwingAnime() && !checkCutDashAnime() &&
!checkCutDashChargeAnime() && (!checkEquipAnime() || checkUpperGuardAnime()) &&
!i_checkRideOn() && checkGuardActionChange()))
{
i_onNoResetFlg2(FLG2_UNK_8000000);
} else {
i_offNoResetFlg2(FLG2_UNK_8000000);
@@ -134,16 +261,48 @@ void daAlink_c::setShieldGuard() {
}
/* 800DD114-800DD1D4 0D7A54 00C0+00 1/1 0/0 0/0 .text setGuardSe__9daAlink_cFP12dCcD_GObjInf */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daAlink_c::setGuardSe(dCcD_GObjInf* param_0) {
nofralloc
#include "asm/d/a/d_a_alink/setGuardSe__9daAlink_cFP12dCcD_GObjInf.s"
void daAlink_c::setGuardSe(dCcD_GObjInf* i_objinf) {
int var_r31;
int var_r30;
if (checkWoodShieldEquipNotIronBall() && !checkMagicArmorNoDamage()) {
var_r31 = 0x29;
var_r30 = 0;
} else {
var_r31 = 0x28;
var_r30 = 1;
}
u32 hit_se;
if (i_objinf->GetTgHitGObj() != NULL && i_objinf->GetTgHitGObj()->GetAtType() == AT_TYPE_BOMB) {
hit_se = Z2SE_HIT_METAL_WEAPON;
} else {
hit_se = i_objinf->GetTgHitObjHitSeID(var_r30);
}
mZ2Link.startCollisionSE(hit_se, var_r31);
}
#pragma pop
/* 800DD1D4-800DD3E4 0D7B14 0210+00 1/1 0/0 0/0 .text setSmallGuard__9daAlink_cFP12dCcD_GObjInf */
#ifdef NONMATCHING
void daAlink_c::setSmallGuard(dCcD_GObjInf* i_objinf) {
setUpperAnimeBase(0x16);
cXyz* dmg_vec = (cXyz*)getDamageVec(i_objinf);
mBodyAngle.y = (dmg_vec->atan2sX_Z() + 0x8000) - shape_angle.y;
if (abs(mBodyAngle.y) > 0x7000) {
mBodyAngle.y = 0;
} else {
mBodyAngle.y =
cLib_minMaxLimit<s16>((s16)mBodyAngle.y, -daAlinkHIO_guard_c0::m.mSmallGuardLRAngleMax,
daAlinkHIO_guard_c0::m.mSmallGuardLRAngleMax);
}
s16 max = daAlinkHIO_guard_c0::m.mSmallGuardFBAngleMax;
s16 min = -max;
mBodyAngle.x = cLib_minMaxLimit<s16>(cM_atan2s(dmg_vec->y, dmg_vec->absXZ()), min, max);
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
@@ -152,6 +311,7 @@ asm void daAlink_c::setSmallGuard(dCcD_GObjInf* param_0) {
#include "asm/d/a/d_a_alink/setSmallGuard__9daAlink_cFP12dCcD_GObjInf.s"
}
#pragma pop
#endif
/* 800DD3E4-800DD894 0D7D24 04B0+00 1/1 0/0 0/0 .text
* procGuardSlipInit__9daAlink_cFiP12dCcD_GObjInf */
src/d/a/d_a_alink_hang.inc
+8 -8
View File
@@ -522,7 +522,7 @@ int daAlink_c::procBossBodyHangInit(fopAc_ac_c* param_0) {
f32 tmp_0 = FLOAT_LABEL(lit_6108);
mNormalSpeed = tmp_0;
setSpecialGravity(tmp_0, mMaxFallSpeed, 0);
setSpecialGravity(tmp_0, maxFallSpeed, 0);
speed.y = FLOAT_LABEL(lit_6108);
mProcVar2.field_0x300c = 0;
@@ -682,7 +682,7 @@ int daAlink_c::procLadderUpEndInit(int param_0) {
setSingleAnimeBaseSpeed(anm_id, daAlinkHIO_ladder_c0::m.field_0x30,
daAlinkHIO_ladder_c0::m.field_0x34);
field_0x2f99 = 14;
setSpecialGravity(FLOAT_LABEL(lit_6108), mMaxFallSpeed, 0);
setSpecialGravity(FLOAT_LABEL(lit_6108), maxFallSpeed, 0);
f32 tmp_0 = FLOAT_LABEL(lit_6108);
speed.y = tmp_0;
@@ -765,7 +765,7 @@ int daAlink_c::procLadderDownEndInit(int param_0) {
setSingleAnimeBaseSpeed(anm_id, daAlinkHIO_ladder_c0::m.field_0x40,
daAlinkHIO_ladder_c0::m.field_0x44);
field_0x2f99 = 14;
setSpecialGravity(FLOAT_LABEL(lit_6108), mMaxFallSpeed, 0);
setSpecialGravity(FLOAT_LABEL(lit_6108), maxFallSpeed, 0);
field_0x30a0 = 0x2800;
field_0x33f4 = lit_6040;
@@ -1118,7 +1118,7 @@ asm int daAlink_c::procClimbWait() {
int daAlink_c::procClimbToRoofInit() {
commonProcInit(PROC_CLIMB_TO_ROOF);
setSingleAnimeBase(ANM_ROOF_UP);
setSpecialGravity(FLOAT_LABEL(lit_6108), mMaxFallSpeed, 0);
setSpecialGravity(FLOAT_LABEL(lit_6108), maxFallSpeed, 0);
f32 tmp_0 = FLOAT_LABEL(lit_6108);
speed.y = tmp_0;
@@ -1205,7 +1205,7 @@ int daAlink_c::procRoofHangStartInit(cBgS_PolyInfo const& param_0, cXyz const& p
field_0x2f98 = 4;
deleteEquipItem(TRUE, FALSE);
setSpecialGravity(FLOAT_LABEL(lit_6108), mMaxFallSpeed, 0);
setSpecialGravity(FLOAT_LABEL(lit_6108), maxFallSpeed, 0);
f32 tmp_0 = FLOAT_LABEL(lit_6108);
mNormalSpeed = tmp_0;
@@ -1303,7 +1303,7 @@ int daAlink_c::procRoofHangSideMoveInit() {
setSingleAnimeBaseSpeed(anm_id, getRoofHangSMoveAnmSpeed(),
daAlinkHIO_roofHang_c0::m.field_0x40);
setSpecialGravity(FLOAT_LABEL(lit_6108), mMaxFallSpeed, 0);
setSpecialGravity(FLOAT_LABEL(lit_6108), maxFallSpeed, 0);
f32 tmp_0 = FLOAT_LABEL(lit_6108);
mNormalSpeed = tmp_0;
@@ -1373,7 +1373,7 @@ int daAlink_c::procRoofHangTurnInit() {
}
field_0x2f98 = 4;
setSpecialGravity(FLOAT_LABEL(lit_6108), mMaxFallSpeed, 0);
setSpecialGravity(FLOAT_LABEL(lit_6108), maxFallSpeed, 0);
f32 tmp_0 = FLOAT_LABEL(lit_6108);
mNormalSpeed = tmp_0;
speed.y = tmp_0;
@@ -1424,7 +1424,7 @@ int daAlink_c::procRoofSwitchHangInit(fopAc_ac_c* param_0) {
deleteEquipItem(TRUE, FALSE);
setSingleAnimeParam(ANM_ROOF_HANG, &daAlinkHIO_roofHang_c0::m.field_0x0);
setSpecialGravity(FLOAT_LABEL(lit_6108), mMaxFallSpeed, 0);
setSpecialGravity(FLOAT_LABEL(lit_6108), maxFallSpeed, 0);
f32 tmp_0 = FLOAT_LABEL(lit_6108);
speed.y = tmp_0;
mNormalSpeed = tmp_0;
src/d/a/d_a_alink_hook.inc
+10 -10
View File
@@ -306,7 +306,7 @@ void daAlink_c::setHookshotSight() {
BOOL line_cross = checkSightLine(length, &sight_pos);
if (mHookTargetAcKeep.getActor() != NULL) {
mSight.setPos(&mHookTargetAcKeep.getActor()->mEyePos);
mSight.setPos(&mHookTargetAcKeep.getActor()->eyePos);
} else {
mSight.setPos(&sight_pos);
}
@@ -894,7 +894,7 @@ void daAlink_c::setHookshotPos() {
}
} else {
if (checkChaseHookshot()) {
cXyz sp188 = mTargetedActor->mEyePos - mHookshotTopPos;
cXyz sp188 = mTargetedActor->eyePos - mHookshotTopPos;
if (sp188.inprod(mIronBallCenterPos) >= 0.0f) {
mIronBallCenterPos = sp188;
mIronBallCenterPos.normalizeZP();
@@ -979,11 +979,11 @@ void daAlink_c::setHookshotPos() {
poly.mNormal.atan2sX_Z(), 0);
dComIfGp_particle_setPolyColor(
particle_id, mRopeLinChk, mRopeLinChk.GetCrossP(), &mTevStr, &sp30,
particle_id, mRopeLinChk, mRopeLinChk.GetCrossP(), &tevStr, &sp30,
(cXyz*)&l_hookSnowSandHitScale, 0, NULL, -1, NULL);
if (poly_att0 == 0xD) {
dComIfGp_particle_setPolyColor(
0x8820, mRopeLinChk, mRopeLinChk.GetCrossP(), &mTevStr, &sp30,
0x8820, mRopeLinChk, mRopeLinChk.GetCrossP(), &tevStr, &sp30,
(cXyz*)&l_hookSnowSandHitScale, 0, NULL, -1, NULL);
}
} else {
@@ -1416,7 +1416,7 @@ int daAlink_c::procHookshotFlyInit() {
setSingleAnimeBase(anm);
mBodyAngle.x = 0;
setSpecialGravity(0.0f, mMaxFallSpeed, 0);
setSpecialGravity(0.0f, maxFallSpeed, 0);
mNormalSpeed = 0.0f;
speed.y = 0.0f;
@@ -1641,7 +1641,7 @@ int daAlink_c::procHookshotRoofWaitInit(int param_0, fopAc_ac_c* param_1, int pa
resetHookshotMode();
field_0x3024 = 1;
setSpecialGravity(0.0f, mMaxFallSpeed, 0);
setSpecialGravity(0.0f, maxFallSpeed, 0);
mNormalSpeed = 0.0f;
speed.y = 0.0f;
current.angle.y = shape_angle.y;
@@ -1759,7 +1759,7 @@ int daAlink_c::procHookshotRoofShootInit(fopAc_ac_c* param_0) {
setSingleAnimeBaseSpeed(anm, 1.0f, 3.0f);
setFastShotTimer();
setSpecialGravity(0.0f, mMaxFallSpeed, 0);
setSpecialGravity(0.0f, maxFallSpeed, 0);
mNormalSpeed = 0.0f;
speed.y = 0.0f;
field_0x2b98 = 6.5f;
@@ -1880,7 +1880,7 @@ int daAlink_c::procHookshotRoofBootsInit(fopAc_ac_c* param_0) {
setSingleAnimeBaseMorf(anm, 2.0f);
resetHookshotMode();
field_0x3024 = 1;
setSpecialGravity(0.0f, mMaxFallSpeed, 0);
setSpecialGravity(0.0f, maxFallSpeed, 0);
mNormalSpeed = 0.0f;
speed.y = 0.0f;
current.angle.y = shape_angle.y;
@@ -1984,7 +1984,7 @@ int daAlink_c::procHookshotWallWaitInit(int param_0, s16 param_1, int param_2) {
dComIfGp_setPlayerStatus1(0, 0x2000000);
resetHookshotMode();
field_0x3024 = 1;
setSpecialGravity(0.0f, mMaxFallSpeed, 0);
setSpecialGravity(0.0f, maxFallSpeed, 0);
mNormalSpeed = 0.0f;
speed.y = 0.0f;
current.angle.y = shape_angle.y;
@@ -2098,7 +2098,7 @@ int daAlink_c::procHookshotWallShootInit() {
setSingleAnimeBaseSpeed(anm, 1.0f, 3.0f);
setFastShotTimer();
setSpecialGravity(0.0f, mMaxFallSpeed, 0);
setSpecialGravity(0.0f, maxFallSpeed, 0);
mNormalSpeed = 0.0f;
speed.y = 0.0f;
src/d/a/d_a_alink_horse.inc
+3 -3
View File
@@ -150,7 +150,7 @@ void daAlink_c::commonInitForceRideRein() {
field_0x30a6 = 0;
initServiceWaitTime();
mAttentionInfo.field_0xa = 0x46;
attention_info.field_0xa = 0x46;
mUnderFrameCtrl[0].onEndFlg();
}
@@ -222,7 +222,7 @@ void daAlink_c::rideGetOff() {
mRideStatus = 0;
i_offNoResetFlg1(FLG1_UNK_1800);
mAttentionInfo.field_0xa = 10;
attention_info.field_0xa = 10;
shape_angle.x = 0;
shape_angle.z = 0;
}
@@ -930,7 +930,7 @@ void daAlink_c::setBodyAngleRideReadyAnime() {
s16 angle;
if (mTargetedActor != NULL) {
angle = cLib_minMaxLimit(
(s16)(cLib_targetAngleY(&current.pos, &mTargetedActor->mEyePos) - shape_angle.y),
(s16)(cLib_targetAngleY(&current.pos, &mTargetedActor->eyePos) - shape_angle.y),
(s16)-0x3800, (s16)0x3800);
} else {
angle = 0;
src/d/a/d_a_alink_hvyboots.inc
+2 -2
View File
@@ -272,7 +272,7 @@ int daAlink_c::cancelMagneBootsOn() {
current.pos.y = gnd_cross;
}
next.pos = current.pos;
old.pos = current.pos;
field_0x3798 = current.pos;
mMagneBootsTopVec = cXyz::BaseY;
@@ -398,7 +398,7 @@ int daAlink_c::procMagneBootsFlyInit() {
mPolyInfo2.SetPolyInfo(mMagneLineChk);
field_0x37c8 = mMagneLineChk.i_GetCross();
setSpecialGravity(0.0f, mMaxFallSpeed, 0);
setSpecialGravity(0.0f, maxFallSpeed, 0);
speed.y = 0.0f;
mNormalSpeed = 0.0f;
src/d/a/d_a_alink_link.inc
+78 -78
View File
@@ -1583,7 +1583,7 @@ int daAlink_c::procAutoJump() {
if (!checkGrabGlide()) {
setSpecialGravity(daAlinkHIO_autoJump_c0::m.mGravity,
daAlinkHIO_autoJump_c0::m.mMaxFallSpeed, 1);
daAlinkHIO_autoJump_c0::m.maxFallSpeed, 1);
mProcVar2.field_0x300c = 0;
resetUpperAnime(UPPER_1, 3.0f);
field_0x30a0 = 0;
@@ -1596,7 +1596,7 @@ int daAlink_c::procAutoJump() {
setSpecialGravity(-1.0f, field_0x3478, 0);
} else {
setSpecialGravity(daAlinkHIO_autoJump_c0::m.mGravity,
daAlinkHIO_autoJump_c0::m.mMaxFallSpeed * 0.66f, 0);
daAlinkHIO_autoJump_c0::m.maxFallSpeed * 0.66f, 0);
}
s16 diff;
@@ -1619,7 +1619,7 @@ int daAlink_c::procAutoJump() {
if (field_0x3198 != 0x8C && temp_f1 > daAlinkHIO_damFall_c0::m.mFallAnmTransitionHeight) {
setSingleAnimeBaseSpeed(ANM_DMG_FALL, 0.0f, daAlinkHIO_damFall_c0::m.mFallAnmMorf);
field_0x3198 = 0x8C;
} else if (speed.y < -mGravity && field_0x2f99 == 4) {
} else if (speed.y < -gravity && field_0x2f99 == 4) {
if (checkGrabGlide()) {
setSpecialGravity(-1.0f, field_0x3478, 0);
mProcVar2.field_0x300c = 1;
@@ -1667,7 +1667,7 @@ int daAlink_c::procDiveJumpInit() {
speed.y = daAlinkHIO_autoJump_c0::m.mDiveSpeedV;
mNormalSpeed = daAlinkHIO_autoJump_c0::m.mDiveSpeedH;
mGravity = daAlinkHIO_autoJump_c0::m.mDiveGravity;
gravity = daAlinkHIO_autoJump_c0::m.mDiveGravity;
mProcVar2.field_0x300c = 0;
current.angle.y = shape_angle.y;
@@ -2026,7 +2026,7 @@ int daAlink_c::procSmallJump() {
if (mLinkAcch.ChkGroundHit()) {
checkLandAction(0);
} else if (speed.y < -mGravity) {
} else if (speed.y < -gravity) {
procFallInit(2, daAlinkHIO_smallJump_c0::m.mFallInterpolation);
} else {
field_0x2f99 = 7;
@@ -2038,10 +2038,10 @@ int daAlink_c::procSmallJump() {
if (checkHeavyStateOn(1, 1) && !i_checkNoResetFlg0(FLG0_UNDERWATER)) {
speed.y = JMAFastSqrt(2.0f * ((daAlinkHIO_smallJump_c0::m.mTargetHeightOffset +
(field_0x3478 - current.pos.y)) *
-(mGravity * 2.25f)));
-(gravity * 2.25f)));
} else {
speed.y =
JMAFastSqrt(2.0f * (-mGravity * (daAlinkHIO_smallJump_c0::m.mTargetHeightOffset +
JMAFastSqrt(2.0f * (-gravity * (daAlinkHIO_smallJump_c0::m.mTargetHeightOffset +
(field_0x3478 - current.pos.y))));
}
@@ -2385,7 +2385,7 @@ int daAlink_c::procCoMetamorphoseOnlyInit() {
f32 tmp_0 = FLOAT_LABEL(lit_6108);
mNormalSpeed = tmp_0;
speed.y = tmp_0;
setSpecialGravity(tmp_0, mMaxFallSpeed, 0);
setSpecialGravity(tmp_0, maxFallSpeed, 0);
return 1;
}
@@ -2535,7 +2535,7 @@ int daAlink_c::execute() {
if (dComIfGp_event_runCheck()) {
field_0x3184 = dComIfGp_evmng_getMyStaffId("Alink", this, 0);
if (mEvtInfo.checkCommandDoor() && !dComIfGp_event_chkEventFlag(4) &&
if (eventInfo.checkCommandDoor() && !dComIfGp_event_chkEventFlag(4) &&
mEquipItem == noentry71)
{
deleteEquipItem(FALSE, FALSE);
@@ -2565,7 +2565,7 @@ int daAlink_c::execute() {
current.angle.y = angle_y - (s16)(current.angle.y - angle_y);
}
dComIfG_Bgsp().MoveBgCrrPos(mMagneLineChk, true, &next.pos, NULL, NULL, false, false);
dComIfG_Bgsp().MoveBgCrrPos(mMagneLineChk, true, &old.pos, NULL, NULL, false, false);
if (getMoveBGActorName(mMagneLineChk, 0) == PROC_Obj_MagneArm) {
field_0x34c8.y += current.pos.y - pos_y;
@@ -2588,11 +2588,11 @@ int daAlink_c::execute() {
dComIfG_Bgsp().MoveBgCrrPos(mLinkAcch.m_gnd, uvar23, &current.pos, &current.angle,
&shape_angle, false, false);
dComIfG_Bgsp().MoveBgCrrPos(mLinkAcch.m_gnd, uvar23, &next.pos, NULL, NULL, false, false);
dComIfG_Bgsp().MoveBgCrrPos(mLinkAcch.m_gnd, uvar23, &old.pos, NULL, NULL, false, false);
field_0x34c8.y += (current.pos.y - pos_y) * 0.1f;
}
field_0x3798 = next.pos;
field_0x3798 = old.pos;
field_0x2fe6 = shape_angle.y;
mPrevStickAngle = mStickAngle;
field_0x33a4 = field_0x33ac;
@@ -2645,7 +2645,7 @@ int daAlink_c::execute() {
field_0x2f91 = 0;
if (mProcID == PROC_BOTTLE_SWING && mEvtInfo.checkCommandCatch()) {
if (mProcID == PROC_BOTTLE_SWING && eventInfo.checkCommandCatch()) {
mDemo.setSpecialDemoType();
}
@@ -2791,11 +2791,11 @@ int daAlink_c::execute() {
}
}
if (checkEndResetFlg1(ERFLG1_UNK_200) || (checkDungeon() && mEvtInfo.checkCommandDoor()) ||
if (checkEndResetFlg1(ERFLG1_UNK_200) || (checkDungeon() && eventInfo.checkCommandDoor()) ||
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->mAttentionInfo.mFlags & 0x400000)) ||
(checkEventRun() && partner != NULL && (partner->attention_info.flags & 0x400000)) ||
!strcmp(dComIfGp_getEventManager().getRunEventName(), l_defaultGetEventName))
{
mWolfEyeUp = daAlinkHIO_wolf_c0::m.mSensesLingerTime;
@@ -3278,7 +3278,7 @@ int daAlink_c::execute() {
}
if (checkDeadHP()) {
mEvtInfo.offCondition(fopAcCnd_NOEXEC_e);
eventInfo.offCondition(fopAcCnd_NOEXEC_e);
} else if (!checkMagneBootsOn()) {
f32 var_f31_2;
if (mLinkAcch.ChkGroundHit()) {
@@ -3290,18 +3290,18 @@ int daAlink_c::execute() {
}
if (cBgW_CheckBGround(var_f31_2) && !checkModeFlg(MODE_PLAYER_FLY)) {
mEvtInfo.onCondition(0x5D);
eventInfo.onCondition(0x5D);
} else if (checkModeFlg(MODE_SWIMMING) || mProcID == PROC_WOLF_ROPE_MOVE ||
((checkReinRide() || checkCanoeRide() || checkSpinnerRide()) &&
!checkNoResetFlg3(FLG3_UNK_80000) && !checkModeFlg(MODE_JUMP)))
{
mEvtInfo.onCondition(dEvtCnd_CANTALK_e);
eventInfo.onCondition(dEvtCnd_CANTALK_e);
if (checkReinRide() || checkCanoeRide()) {
mEvtInfo.onCondition(dEvtCnd_CANGETITEM_e);
eventInfo.onCondition(dEvtCnd_CANGETITEM_e);
}
}
} else if (checkMagneBootsOn() && cBgW_CheckBGround(mMagneBootsTopVec.y)) {
mEvtInfo.onCondition(dEvtCnd_CANTALK_e);
eventInfo.onCondition(dEvtCnd_CANTALK_e);
}
if (checkEndResetFlg1(ERFLG1_UNK_40000) && checkMidnaRide() && checkWolf()) {
@@ -3471,7 +3471,7 @@ int daAlink_c::execute() {
mEndResetFlg1 = 0;
mEndResetFlg2 = 0;
field_0x3540 = next.pos;
field_0x3540 = old.pos;
field_0x3108 = shape_angle.y;
if (checkHorseRide() && checkBoarSingleBattle()) {
@@ -3594,14 +3594,14 @@ void daAlink_c::modelCalc(J3DModel* p_model) {
/* 800CC298-800CC2E0 0C6BD8 0048+00 2/2 0/0 0/0 .text basicModelDraw__9daAlink_cFP8J3DModel */
void daAlink_c::basicModelDraw(J3DModel* i_model) {
g_env_light.setLightTevColorType_MAJI(i_model, &mTevStr);
g_env_light.setLightTevColorType_MAJI(i_model, &tevStr);
mDoExt_modelEntryDL(i_model);
}
/* 800CC2E0-800CC364 0C6C20 0084+00 1/1 0/0 0/0 .text modelDraw__9daAlink_cFP8J3DModeli
*/
void daAlink_c::modelDraw(J3DModel* i_model, int param_1) {
g_env_light.setLightTevColorType_MAJI(i_model, &mTevStr);
g_env_light.setLightTevColorType_MAJI(i_model, &tevStr);
if (param_1 == 0) {
mDoExt_modelEntryDL(i_model);
@@ -3674,12 +3674,12 @@ void daAlink_c::setWaterDropColor(J3DGXColorS10 const* i_color) {
/* 800CC7DC-800CC7FC 0C711C 0020+00 2/2 0/0 0/0 .text initTevCustomColor__9daAlink_cFv */
void daAlink_c::initTevCustomColor() {
mTevStr.field_0x367 = 0;
mTevStr.mFogColor.r = 0;
mTevStr.mFogColor.g = 0;
mTevStr.mFogColor.b = 0;
mTevStr.field_0x360 = 0;
mTevStr.field_0x362 = 0;
tevStr.field_0x367 = 0;
tevStr.mFogColor.r = 0;
tevStr.mFogColor.g = 0;
tevStr.mFogColor.b = 0;
tevStr.field_0x360 = 0;
tevStr.field_0x362 = 0;
}
/* 800CC7FC-800CD78C 0C713C 0F90+00 1/1 0/0 0/0 .text draw__9daAlink_cFv */
@@ -3687,9 +3687,9 @@ void daAlink_c::initTevCustomColor() {
#ifdef NONMATCHING
int daAlink_c::draw() {
if (i_checkWolf()) {
g_env_light.settingTevStruct(9, &current.pos, &mTevStr);
g_env_light.settingTevStruct(9, &current.pos, &tevStr);
} else {
g_env_light.settingTevStruct(10, &current.pos, &mTevStr);
g_env_light.settingTevStruct(10, &current.pos, &tevStr);
}
initTevCustomColor();
@@ -3712,15 +3712,15 @@ int daAlink_c::draw() {
if (mClothesChangeWaitTimer != 0) {
if (mProcID == PROC_METAMORPHOSE) {
if (mProcVar3.field_0x300e.x > 0) {
mTevStr.mFogColor.r = 255;
tevStr.mFogColor.r = 255;
} else {
mTevStr.mFogColor.r = -255;
tevStr.mFogColor.r = -255;
}
mTevStr.mFogColor.g = mTevStr.mFogColor.r;
mTevStr.mFogColor.b = mTevStr.mFogColor.r;
tevStr.mFogColor.g = tevStr.mFogColor.r;
tevStr.mFogColor.b = tevStr.mFogColor.r;
g_env_light.setLightTevColorType_MAJI(mpWlChangeModel, &mTevStr);
g_env_light.setLightTevColorType_MAJI(mpWlChangeModel, &tevStr);
mDoExt_modelEntryDL(mpWlChangeModel);
}
return 1;
@@ -3731,22 +3731,22 @@ int daAlink_c::draw() {
BOOL var_r31 = 1;
if (field_0x06f4 != NULL) {
field_0x06f4->getTevColorReg(0, &mTevStr.mFogColor);
field_0x06f4->getTevColorReg(0, &tevStr.mFogColor);
} else if (mProcID == PROC_METAMORPHOSE || mProcID == PROC_DUNGEON_WARP ||
mProcID == PROC_DUNGEON_WARP_SCN_START)
{
mTevStr.mFogColor.r = mProcVar3.field_0x300e.x;
mTevStr.mFogColor.g = mProcVar3.field_0x300e.x;
mTevStr.mFogColor.b = mProcVar3.field_0x300e.x;
tevStr.mFogColor.r = mProcVar3.field_0x300e.x;
tevStr.mFogColor.g = mProcVar3.field_0x300e.x;
tevStr.mFogColor.b = mProcVar3.field_0x300e.x;
} else if (field_0x346c != 0.0f) {
f32 var_f2 = fabsf(field_0x346c);
mTevStr.mFogColor.r = var_f2 * daAlinkHIO_wolf_c0::m.mLightDropR;
mTevStr.mFogColor.g = var_f2 * daAlinkHIO_wolf_c0::m.mLightDropG;
mTevStr.mFogColor.b = var_f2 * daAlinkHIO_wolf_c0::m.mLightDropB;
tevStr.mFogColor.r = var_f2 * daAlinkHIO_wolf_c0::m.mLightDropR;
tevStr.mFogColor.g = var_f2 * daAlinkHIO_wolf_c0::m.mLightDropG;
tevStr.mFogColor.b = var_f2 * daAlinkHIO_wolf_c0::m.mLightDropB;
} else if (checkFreezeDamage()) {
mTevStr.mFogColor.r = daAlinkHIO_damage_c0::m.mFreezeR;
mTevStr.mFogColor.g = daAlinkHIO_damage_c0::m.mFreezeG;
mTevStr.mFogColor.b = daAlinkHIO_damage_c0::m.mFreezeB;
tevStr.mFogColor.r = daAlinkHIO_damage_c0::m.mFreezeR;
tevStr.mFogColor.g = daAlinkHIO_damage_c0::m.mFreezeG;
tevStr.mFogColor.b = daAlinkHIO_damage_c0::m.mFreezeB;
} else if (mDamageTimer != 0) {
if (!checkMagicArmorNoDamage()) {
int color_timer = mDamageTimer + mDamageColorTime;
@@ -3767,25 +3767,25 @@ int daAlink_c::draw() {
}
f32 var_f2 = fabsf(cM_ssin(color_timer * 0x800));
mTevStr.field_0x360 = r * var_f2;
mTevStr.field_0x361 = g * var_f2;
mTevStr.field_0x362 = b * var_f2;
tevStr.field_0x360 = r * var_f2;
tevStr.field_0x361 = g * var_f2;
tevStr.field_0x362 = b * var_f2;
var_r31 = 0;
}
} else if (field_0x3006 != 0) {
f32 temp_f4 = 1.0f - (field_0x3006 * (1.0f / daAlinkHIO_damage_c0::m.mFreezeTime));
f32 temp_f3 = 1.0f - temp_f4;
mTevStr.mFogColor.r = (temp_f4 * daAlinkHIO_damage_c0::m.mFreezeInitR) +
tevStr.mFogColor.r = (temp_f4 * daAlinkHIO_damage_c0::m.mFreezeInitR) +
(temp_f3 * daAlinkHIO_damage_c0::m.mFreezeR);
mTevStr.mFogColor.g = (temp_f4 * daAlinkHIO_damage_c0::m.mFreezeInitG) +
tevStr.mFogColor.g = (temp_f4 * daAlinkHIO_damage_c0::m.mFreezeInitG) +
(temp_f3 * daAlinkHIO_damage_c0::m.mFreezeG);
mTevStr.mFogColor.b = (temp_f4 * daAlinkHIO_damage_c0::m.mFreezeInitB) +
tevStr.mFogColor.b = (temp_f4 * daAlinkHIO_damage_c0::m.mFreezeInitB) +
(temp_f3 * daAlinkHIO_damage_c0::m.mFreezeB);
} else if (field_0x32b0[0].r != 0) {
mTevStr.mFogColor.r = field_0x32b0[0].r;
mTevStr.mFogColor.g = field_0x32b0[0].g;
mTevStr.mFogColor.b = field_0x32b0[0].b;
tevStr.mFogColor.r = field_0x32b0[0].r;
tevStr.mFogColor.g = field_0x32b0[0].g;
tevStr.mFogColor.b = field_0x32b0[0].b;
var_r29 = 1;
} else {
var_r31 = 0;
@@ -3802,7 +3802,7 @@ int daAlink_c::draw() {
setWaterDropColor(&field_0x32b0[1]);
} else {
mSwordUpColorIntensity = 0.0f;
setWaterDropColor((J3DGXColorS10*)&mTevStr.mFogColor);
setWaterDropColor((J3DGXColorS10*)&tevStr.mFogColor);
}
} else {
if (checkMagicArmorWearAbility()) {
@@ -3826,9 +3826,9 @@ int daAlink_c::draw() {
}
}
mTevStr.field_0x360 = 0;
mTevStr.field_0x361 = 0;
mTevStr.field_0x362 = 0;
tevStr.field_0x360 = 0;
tevStr.field_0x361 = 0;
tevStr.field_0x362 = 0;
if (checkSwordDraw()) {
modelDraw(mSwordModel, temp_r30);
@@ -3913,9 +3913,9 @@ int daAlink_c::draw() {
modelDraw(mpLinkFaceModel, var_r3);
}
mTevStr.field_0x360 = 0;
mTevStr.field_0x361 = 0;
mTevStr.field_0x362 = 0;
tevStr.field_0x360 = 0;
tevStr.field_0x361 = 0;
tevStr.field_0x362 = 0;
if (checkSwordDraw()) {
if (!i_checkNoResetFlg3(FLG3_UNK_80000000)) {
@@ -3930,9 +3930,9 @@ int daAlink_c::draw() {
if (checkShieldDraw()) {
BOOL var_r24_2;
if (checkWoodShieldEquip() && field_0x2fcb != 0 && mProcID != PROC_METAMORPHOSE) {
mTevStr.mFogColor.r = -((120 - field_0x2fcb) * 32) / 120;
mTevStr.mFogColor.g = mTevStr.mFogColor.r;
mTevStr.mFogColor.b = mTevStr.mFogColor.r;
tevStr.mFogColor.r = -((120 - field_0x2fcb) * 32) / 120;
tevStr.mFogColor.g = tevStr.mFogColor.r;
tevStr.mFogColor.b = tevStr.mFogColor.r;
var_r24_2 = 1;
} else {
var_r24_2 = 0;
@@ -3940,16 +3940,16 @@ int daAlink_c::draw() {
modelDraw(mShieldModel, var_r3);
if (var_r24_2) {
mTevStr.mFogColor.r = 0;
mTevStr.mFogColor.g = 0;
mTevStr.mFogColor.b = 0;
tevStr.mFogColor.r = 0;
tevStr.mFogColor.g = 0;
tevStr.mFogColor.b = 0;
}
}
if (var_r29) {
mTevStr.mFogColor.r = 0;
mTevStr.mFogColor.g = 0;
mTevStr.mFogColor.b = 0;
tevStr.mFogColor.r = 0;
tevStr.mFogColor.g = 0;
tevStr.mFogColor.b = 0;
}
if (checkItemDraw()) {
@@ -3994,22 +3994,22 @@ int daAlink_c::draw() {
}
if (i_checkEquipHeavyBoots()) {
GXColorS10 color = mTevStr.mFogColor;
GXColorS10 color = tevStr.mFogColor;
for (int i = 0; i < 2; i++) {
JPABaseEmitter* emitter_p = dComIfGp_particle_getEmitter(field_0x3228[i][0]);
if (emitter_p != NULL) {
mTevStr.mFogColor.r = 5;
mTevStr.mFogColor.g = mTevStr.mFogColor.r;
mTevStr.mFogColor.b = mTevStr.mFogColor.r;
tevStr.mFogColor.r = 5;
tevStr.mFogColor.g = tevStr.mFogColor.r;
tevStr.mFogColor.b = tevStr.mFogColor.r;
} else {
mTevStr.mFogColor = color;
tevStr.mFogColor = color;
}
modelDraw(mpLinkBootModels[i], temp_r30);
}
mTevStr.mFogColor = color;
tevStr.mFogColor = color;
}
}
@@ -4340,7 +4340,7 @@ int daAlink_c::procCoPeepSubjectivityInit() {
}
i_onPlayerNoDraw();
setSpecialGravity(FLOAT_LABEL(lit_6108), mMaxFallSpeed, 0);
setSpecialGravity(FLOAT_LABEL(lit_6108), maxFallSpeed, 0);
speed.y = FLOAT_LABEL(lit_6108);
dComIfGp_setPlayerStatus0(0, 0x2000);
field_0x3478 = lit_6183;
src/d/a/d_a_alink_spinner.inc
+1 -1
View File
@@ -200,7 +200,7 @@ int daAlink_c::procSpinnerWaitInit() {
setBgCheckParam();
setSingleAnimeBaseSpeed(ANM_RIDE_CROUCH, daAlinkHIO_board_c0::m.mSitAnmSpeed, 4.0f);
speed.y = 0.0f;
setSpecialGravity(0.0f, mMaxFallSpeed, 0);
setSpecialGravity(0.0f, maxFallSpeed, 0);
mNormalSpeed = 0.0f;
mProcVar2.field_0x300c = 0;
src/d/a/d_a_alink_sumou.inc
+1 -1
View File
@@ -897,7 +897,7 @@ int daAlink_c::procSumouWinLoseInit() {
field_0x3198 = anm;
mNormalSpeed = 0.0f;
setSpecialGravity(0.0f, mMaxFallSpeed, 0);
setSpecialGravity(0.0f, maxFallSpeed, 0);
speed.y = 0.0f;
setFootEffectProcType(5);
mProcVar3.field_0x300e.x = 0;
src/d/a/d_a_alink_swim.inc
+3 -3
View File
@@ -495,7 +495,7 @@ int daAlink_c::procSwimWait() {
current.angle.y = shape_angle.y;
}
mMaxFallSpeed = getSwimMaxFallSpeed();
maxFallSpeed = getSwimMaxFallSpeed();
field_0x594 = getSwimFrontMaxSpeed();
setSpeedAndAngleSwim();
@@ -628,7 +628,7 @@ int daAlink_c::procSwimMove() {
#ifdef NONMATCHING
int daAlink_c::procSwimDiveInit() {
commonProcInit(PROC_SWIM_DIVE);
setSpecialGravity(0.0f, mMaxFallSpeed, 0);
setSpecialGravity(0.0f, maxFallSpeed, 0);
speed.y = 0.0f;
if (i_checkNoResetFlg0(FLG0_UNK_100)) {
@@ -760,7 +760,7 @@ int daAlink_c::procSwimHookshotSubjectInit() {
/* 80104D7C-80104EB8 0FF6BC 013C+00 1/0 0/0 0/0 .text procSwimHookshotSubject__9daAlink_cFv */
int daAlink_c::procSwimHookshotSubject() {
mMaxFallSpeed = getSwimMaxFallSpeed();
maxFallSpeed = getSwimMaxFallSpeed();
field_0x594 = getSwimFrontMaxSpeed();
if (checkHookshotWait()) {
src/d/a/d_a_alink_swindow.inc
+1 -1
View File
@@ -280,7 +280,7 @@ void daAlink_c::statusWindowExecute(cXyz const* param_0, s16 param_1) {
/* 80140984-80140AC8 13B2C4 0144+00 0/0 1/1 0/0 .text statusWindowDraw__9daAlink_cFv */
void daAlink_c::statusWindowDraw() {
if (mClothesChangeWaitTimer == 0) {
g_env_light.settingTevStruct(12, &current.pos, &mTevStr);
g_env_light.settingTevStruct(12, &current.pos, &tevStr);
initTevCustomColor();
if (!i_checkWolf()) {
src/d/a/d_a_alink_weakfn.inc
+9 -9
View File
@@ -514,12 +514,12 @@ void daPy_py_c::setMidnaMsgNum(fopAc_ac_c* param_0, u16 param_1) {
/* 8014150C-80141514 13BE4C 0008+00 1/0 0/0 0/0 .text getModelMtx__9daPy_py_cFv */
MtxP daPy_py_c::getModelMtx() {
return mCullMtx;
return cullMtx;
}
/* 80141514-8014151C 13BE54 0008+00 1/0 0/0 0/0 .text getInvMtx__9daPy_py_cFv */
MtxP daPy_py_c::getInvMtx() {
return mCullMtx;
return cullMtx;
}
/* 8014151C-80141524 13BE5C 0008+00 1/0 0/0 0/0 .text getShadowTalkAtnPos__9daPy_py_cFv
@@ -530,37 +530,37 @@ cXyz* daPy_py_c::getShadowTalkAtnPos() {
/* 80141524-8014152C 13BE64 0008+00 1/0 0/0 0/0 .text getLeftItemMatrix__9daPy_py_cFv */
MtxP daPy_py_c::getLeftItemMatrix() {
return mCullMtx;
return cullMtx;
}
/* 8014152C-80141534 13BE6C 0008+00 1/0 0/0 0/0 .text getRightItemMatrix__9daPy_py_cFv */
MtxP daPy_py_c::getRightItemMatrix() {
return mCullMtx;
return cullMtx;
}
/* 80141534-8014153C 13BE74 0008+00 1/0 0/0 0/0 .text getLeftHandMatrix__9daPy_py_cFv */
MtxP daPy_py_c::getLeftHandMatrix() {
return mCullMtx;
return cullMtx;
}
/* 8014153C-80141544 13BE7C 0008+00 1/0 0/0 0/0 .text getRightHandMatrix__9daPy_py_cFv */
MtxP daPy_py_c::getRightHandMatrix() {
return mCullMtx;
return cullMtx;
}
/* 80141544-8014154C 13BE84 0008+00 1/0 0/0 0/0 .text getLinkBackBone1Matrix__9daPy_py_cFv */
MtxP daPy_py_c::getLinkBackBone1Matrix() {
return mCullMtx;
return cullMtx;
}
/* 8014154C-80141554 13BE8C 0008+00 1/0 0/0 0/0 .text getWolfMouthMatrix__9daPy_py_cFv */
MtxP daPy_py_c::getWolfMouthMatrix() {
return mCullMtx;
return cullMtx;
}
/* 80141554-8014155C 13BE94 0008+00 1/0 0/0 0/0 .text getWolfBackbone2Matrix__9daPy_py_cFv */
MtxP daPy_py_c::getWolfBackbone2Matrix() {
return mCullMtx;
return cullMtx;
}
/* 8014155C-80141564 13BE9C 0008+00 1/0 0/0 0/0 .text getBottleMtx__9daPy_py_cFv */
src/d/a/d_a_alink_wolf.inc
+40 -40
View File
@@ -226,7 +226,7 @@ void daAlink_c::changeWolf() {
field_0x32c4 = 1;
field_0x32c6 = 2;
field_0x30b6 = 2;
mAttentionInfo.field_0xa = 50;
attention_info.field_0xa = 50;
dCcD_Cyl* cyl_p = field_0x850;
for (int i = 0; i < 3; i++) {
@@ -522,7 +522,7 @@ void daAlink_c::changeLink(int param_0) {
field_0x30b6 = 5;
field_0x32c4 = 2;
field_0x32c6 = 16;
mAttentionInfo.field_0xa = 10;
attention_info.field_0xa = 10;
dCcD_Cyl* cyl_p = field_0x850;
for (int i = 0; i < 3; i++) {
@@ -1884,7 +1884,7 @@ int daAlink_c::procWolfSideStepInit(int param_0) {
if (field_0x2f98 == 1) {
if (mTargetedActor != NULL) {
mProcVar2.field_0x300c = cLib_targetAngleY(&current.pos, &mTargetedActor->mEyePos);
mProcVar2.field_0x300c = cLib_targetAngleY(&current.pos, &mTargetedActor->eyePos);
} else {
mProcVar2.field_0x300c = shape_angle.y;
}
@@ -2030,7 +2030,7 @@ int daAlink_c::procWolfBackJumpInit(int param_0) {
}
if (mTargetedActor != NULL && param_0 == 0) {
mProcVar2.field_0x300c = cLib_targetAngleY(&current.pos, &mTargetedActor->mEyePos);
mProcVar2.field_0x300c = cLib_targetAngleY(&current.pos, &mTargetedActor->eyePos);
} else {
mProcVar2.field_0x300c = shape_angle.y;
}
@@ -2273,7 +2273,7 @@ int daAlink_c::procWolfAutoJump() {
field_0x2f99 = 12;
setSingleAnimeWolfBaseSpeed(WANM_FALL_LAND, 0.0f, daAlinkHIO_wlDamFall_c0::m.field_0x3C);
} else if (checkUnderMove0BckNoArcWolf(WANM_JUMP_ATTACK_START)) {
if (speed.y < -mGravity) {
if (speed.y < -gravity) {
field_0x2f99 = 12;
setSingleAnimeWolfParam(WANM_JUMP_ATTACK, &daAlinkHIO_wlAutoJump_c0::m.field_0x28);
} else if (checkAnmEnd(frameCtrl_p)) {
@@ -2285,7 +2285,7 @@ int daAlink_c::procWolfAutoJump() {
mProcVar2.field_0x300c = 0;
}
} else if (mProcVar2.field_0x300c == 0 && checkUnderMove0BckNoArcWolf(WANM_JUMP_ATTACK) &&
speed.y < -mGravity)
speed.y < -gravity)
{
mProcVar2.field_0x300c = 1;
frameCtrl_p->setRate(daAlinkHIO_wlAutoJump_c0::m.field_0x28.mSpeed);
@@ -3145,8 +3145,8 @@ int daAlink_c::procWolfHowlDemoInit() {
cXyz sp14;
cXyz sp8;
sp14.set(mAttentionInfo.mPosition.x, mAttentionInfo.mPosition.y - 50.0f,
mAttentionInfo.mPosition.z);
sp14.set(attention_info.position.x, attention_info.position.y - 50.0f,
attention_info.position.z);
sp8.set(sp14.x + var_f31, sp14.y, sp14.z + var_f30);
if (commonLineCheck(&sp14, &sp8)) {
@@ -3727,7 +3727,7 @@ int daAlink_c::procWolfRopeMoveInit(int param_0, int param_1) {
getNowAnmPackUnder(UNDER_0)->setFrame(13.5f);
}
setSpecialGravity(0.0f, mMaxFallSpeed, 0);
setSpecialGravity(0.0f, maxFallSpeed, 0);
speed.y = 0.0f;
if (param_1) {
@@ -3817,7 +3817,7 @@ int daAlink_c::procWolfRopeHangInit(int param_0) {
mProcVar0.field_0x3008 = 0;
setWolfRopePosY();
setWolfRopeOffsetY(0);
setSpecialGravity(0.0f, mMaxFallSpeed, 0);
setSpecialGravity(0.0f, maxFallSpeed, 0);
speed.y = 0.0f;
mNormalSpeed = 0.0f;
shape_angle.x = 0;
@@ -3852,7 +3852,7 @@ int daAlink_c::procWolfRopeTurnInit() {
commonProcInit(PROC_WOLF_ROPE_TURN);
setSingleAnimeWolfParam(WANM_ROPE_TURN, &daAlinkHIO_wlRope_c0::m.field_0x0);
voiceStart(Z2SE_WL_V_BREATH_JUMP);
setSpecialGravity(0.0f, mMaxFallSpeed, 0);
setSpecialGravity(0.0f, maxFallSpeed, 0);
speed.y = 0.0f;
mNormalSpeed = 0.0f;
@@ -3905,7 +3905,7 @@ int daAlink_c::procWolfRopeStaggerInit(int param_0) {
mProcVar3.field_0x300e.y = param_0;
mProcVar2.field_0x300c = initWolfRopeShapeAngle();
setSpecialGravity(0.0f, mMaxFallSpeed, 0);
setSpecialGravity(0.0f, maxFallSpeed, 0);
speed.y = 0.0f;
current.angle.y = shape_angle.y;
@@ -3953,7 +3953,7 @@ int daAlink_c::procWolfRopeSubjectivityInit() {
mProcVar2.field_0x300c = initWolfRopeShapeAngle();
current.angle.y = shape_angle.y;
setSpecialGravity(FLOAT_LABEL(lit_6108), mMaxFallSpeed, 0);
setSpecialGravity(FLOAT_LABEL(lit_6108), maxFallSpeed, 0);
f32 tmp_0 = FLOAT_LABEL(lit_6108);
speed.y = tmp_0;
@@ -4015,7 +4015,7 @@ asm int daAlink_c::getWolfTagJumpTime() const {
/* 80133EF0-80134000 12E830 0110+00 3/3 1/1 1/1 .text checkMidnaLockJumpPoint__9daAlink_cCFv */
const cXyz* daAlink_c::checkMidnaLockJumpPoint() const {
if ((!mLinkAcch.i_ChkGroundHit() && mProcID != PROC_WOLF_TAG_JUMP) || checkMidnaUseAbility() ||
getMidnaActor()->mEvtInfo.checkCommandTalk())
getMidnaActor()->eventInfo.checkCommandTalk())
{
return NULL;
}
@@ -4806,7 +4806,7 @@ BOOL daAlink_c::checkMidnaDisappearMode() const {
return mProcID == PROC_WOLF_DIG_THROUGH ||
(i_checkWolf() && i_dComIfGp_checkPlayerStatus0(0, 0x8000000) &&
!i_dComIfGp_checkPlayerStatus0(0, 0x10) &&
(mTargetedActor == NULL || !(mTargetedActor->mAttentionInfo.mFlags & 0x800000)));
(mTargetedActor == NULL || !(mTargetedActor->attention_info.flags & 0x800000)));
}
/* 801371FC-801372B4 131B3C 00B8+00 3/3 0/0 0/0 .text checkWolfLieContinue__9daAlink_cFi
@@ -4817,7 +4817,7 @@ BOOL daAlink_c::checkWolfLieContinue(int param_0) {
cM3dGPla slide_poly;
if ((param_0 ||
((mTargetedActor != NULL && (mTargetedActor->mAttentionInfo.mFlags & 0x800000)) &&
((mTargetedActor != NULL && (mTargetedActor->attention_info.flags & 0x800000)) &&
(fopAcM_GetName(mTargetedActor) == PROC_NPC_JAGAR ||
fopAcM_GetName(mTargetedActor) == PROC_NPC_BOU))) &&
!getSlidePolygon(&slide_poly) && !checkWolfLieWaterIn())
@@ -5544,8 +5544,8 @@ void daAlink_c::resetWolfBallGrab() {
resetUpperAnime(UPPER_2, 3.0f);
}
dComIfGp_particle_setColor(0x86CE, &mHeldItemRootPos, &mTevStr, NULL, NULL, 0.0f, 0xFF);
dComIfGp_particle_setColor(0x86CF, &mHeldItemRootPos, &mTevStr, NULL, NULL, 0.0f, 0xFF);
dComIfGp_particle_setColor(0x86CE, &mHeldItemRootPos, &tevStr, NULL, NULL, 0.0f, 0xFF);
dComIfGp_particle_setColor(0x86CF, &mHeldItemRootPos, &tevStr, NULL, NULL, 0.0f, 0xFF);
i_onEndResetFlg0(ERFLG0_UNK_20000000);
i_offNoResetFlg3(FLG3_UNK_200000);
}
@@ -5636,12 +5636,12 @@ 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->mAttentionInfo.mFlags & 5 &&
if (fopAcM_GetGroup(enemy_p) == 2 && enemy_p->attention_info.flags & 5 &&
!enemy_p->checkWolfNoLock())
{
f32 dist_to_enemy = current.pos.abs2(enemy_p->mEyePos);
f32 dist_to_enemy = current.pos.abs2(enemy_p->eyePos);
if (enemy_p->mEyePos.y >= current.pos.y - lit_6895 && dist_to_enemy < field_0x3478) {
if (enemy_p->eyePos.y >= current.pos.y - lit_6895 && dist_to_enemy < field_0x3478) {
field_0x3478 = dist_to_enemy;
*lock_actor_pp = i_actor;
}
@@ -5862,7 +5862,7 @@ int daAlink_c::procWolfRollAttackMove() {
if (!swordButton() || mProcVar1.field_0x300a == 0) {
if (mTargetedActor != NULL) {
shape_angle.y = cLib_targetAngleY(&current.pos, &mTargetedActor->mEyePos);
shape_angle.y = cLib_targetAngleY(&current.pos, &mTargetedActor->eyePos);
current.angle.y = shape_angle.y;
}
@@ -6084,7 +6084,7 @@ int daAlink_c::procWolfJumpAttackKickInit() {
f32 tmp_0 = FLOAT_LABEL(lit_6108);
speed.y = tmp_0;
mNormalSpeed = tmp_0;
setSpecialGravity(tmp_0, mMaxFallSpeed, 0);
setSpecialGravity(tmp_0, maxFallSpeed, 0);
voiceStart(Z2SE_WL_V_ATTACK_S);
seStartOnlyReverb(Z2SE_WOLFATTACK_WIND_S);
@@ -6294,7 +6294,7 @@ int daAlink_c::procWolfWaitAttackInit(int i_attackType) {
atk_hio->field_0x0.mEndFrame, atk_hio->field_0x0.mInterpolation);
if (mTargetedActor != NULL) {
shape_angle.y = cLib_targetAngleY(&current.pos, &mTargetedActor->mEyePos);
shape_angle.y = cLib_targetAngleY(&current.pos, &mTargetedActor->eyePos);
}
current.angle.y = shape_angle.y;
@@ -6523,12 +6523,12 @@ int daAlink_c::procWolfDownAttackInit() {
speed.y = daAlinkHIO_wlAtDown_c0::m.field_0x90;
f32 temp_f3 = speed.y + mGravity;
f32 var_f0 = temp_f3 * temp_f3 + mGravity * 2.0f * (sp24.y - current.pos.y);
f32 temp_f3 = speed.y + gravity;
f32 var_f0 = temp_f3 * temp_f3 + gravity * 2.0f * (sp24.y - current.pos.y);
if (var_f0 < 0.0f) {
mNormalSpeed = (var_f1 * mGravity) / -temp_f3;
mNormalSpeed = (var_f1 * gravity) / -temp_f3;
} else {
mNormalSpeed = (var_f1 * mGravity) / (-JMAFastSqrt(var_f0) - temp_f3);
mNormalSpeed = (var_f1 * gravity) / (-JMAFastSqrt(var_f0) - temp_f3);
}
mProcVar2.field_0x300c = 0;
@@ -6556,7 +6556,7 @@ int daAlink_c::procWolfDownAttack() {
fopEn_enemy_c* enemy_p = (fopEn_enemy_c*)field_0x280c.getActor();
if (enemy_p != NULL && enemy_p->checkDownFlg() &&
mEyePos.abs2XZ(enemy_p->getDownPos()) < 10000.0f &&
eyePos.abs2XZ(enemy_p->getDownPos()) < 10000.0f &&
fabsf(enemy_p->current.pos.y - current.pos.y) < 50.0f)
{
procWolfDownAtLandInit(enemy_p);
@@ -6633,11 +6633,11 @@ int daAlink_c::procWolfDownAtLand() {
if (enemy_p != NULL) {
enemy_p->onWolfDownPullEndFlg();
dComIfGp_particle_setColor(0x86CA, &enemy_p->getDownPos(), &mTevStr, NULL, NULL,
dComIfGp_particle_setColor(0x86CA, &enemy_p->getDownPos(), &tevStr, NULL, NULL,
0.0f, 0xFF);
dComIfGp_particle_setColor(0x86CB, &enemy_p->getDownPos(), &mTevStr, NULL, NULL,
dComIfGp_particle_setColor(0x86CB, &enemy_p->getDownPos(), &tevStr, NULL, NULL,
0.0f, 0xFF);
dComIfGp_particle_setColor(0x86CC, &enemy_p->getDownPos(), &mTevStr, NULL, NULL,
dComIfGp_particle_setColor(0x86CC, &enemy_p->getDownPos(), &tevStr, NULL, NULL,
0.0f, 0xFF);
}
@@ -6750,7 +6750,7 @@ int daAlink_c::procWolfLockAttack() {
mProcVar0.field_0x3008--;
if (mProcVar0.field_0x3008 == 0) {
setSpecialGravity(daAlinkHIO_wlAtLock_c0::m.field_0x48, mMaxFallSpeed, 0);
setSpecialGravity(daAlinkHIO_wlAtLock_c0::m.field_0x48, maxFallSpeed, 0);
}
} else if (mNormalSpeed > 30.0f) {
cLib_addCalc(&mNormalSpeed, 30.0f, 0.3f, 5.0f, 1.0f);
@@ -6800,7 +6800,7 @@ asm int daAlink_c::procWolfLockAttack() {
int daAlink_c::procWolfLockAttackTurnInit(int param_0) {
commonProcInit(PROC_WOLF_LOCK_ATTACK_TURN);
if (abs((s16)(cLib_targetAngleY(&current.pos, &mWolfLockAcKeep[0].getActor()->mEyePos) -
if (abs((s16)(cLib_targetAngleY(&current.pos, &mWolfLockAcKeep[0].getActor()->eyePos) -
shape_angle.y)) > 0x4000)
{
setSingleAnimeWolfParam(WANM_ATTACK_A_END_BACK, &daAlinkHIO_wlAtLock_c0::m.field_0x14);
@@ -6852,7 +6852,7 @@ int daAlink_c::procWolfLockAttackTurn() {
}
if (mWolfLockNum != 0) {
s16 target_angle = cLib_targetAngleY(&current.pos, &mWolfLockAcKeep[0].getActor()->mEyePos);
s16 target_angle = cLib_targetAngleY(&current.pos, &mWolfLockAcKeep[0].getActor()->eyePos);
if (mProcVar2.field_0x300c != 0) {
target_angle += 0x8000;
}
@@ -7037,7 +7037,7 @@ int daAlink_c::procWolfEnemyHangBiteInit() {
f32 tmp_0 = FLOAT_LABEL(lit_6108);
mNormalSpeed = tmp_0;
speed.y = tmp_0;
setSpecialGravity(tmp_0, mMaxFallSpeed, 0);
setSpecialGravity(tmp_0, maxFallSpeed, 0);
if (!setWolfEnemyHangBitePos((fopEn_enemy_c*)field_0x281c.getActor())) {
return procWolfJumpAttackKickInit();
@@ -7461,7 +7461,7 @@ int daAlink_c::procWolfCargoCarryInit() {
f32 tmp_0 = FLOAT_LABEL(lit_6108);
mNormalSpeed = tmp_0;
speed.y = tmp_0;
setSpecialGravity(tmp_0, mMaxFallSpeed, 0);
setSpecialGravity(tmp_0, maxFallSpeed, 0);
daAlink_WANM anm;
if (checkCargoCarry()) {
@@ -7587,7 +7587,7 @@ int daAlink_c::procWolfGanonCatchInit() {
}
mDemo.i_setSpecialDemoType();
field_0x27f4->mStatus |= 0x800;
field_0x27f4->actor_status |= 0x800;
commonProcInit(PROC_WOLF_GANON_CATCH);
field_0x280c.setData(field_0x27f4);
@@ -7724,7 +7724,7 @@ int daAlink_c::procWolfChainReady() {
mProcVar2.field_0x300c = angle >> 1;
mNormalSpeed = dist_xz * 40.0f / dist + 1.0f;
mProcVar0.field_0x3008 = dist_xz / mNormalSpeed + 1.0f;
speed.y = (vec1.y - mGravity * 0.5f * mProcVar0.field_0x3008 * mProcVar0.field_0x3008)
speed.y = (vec1.y - gravity * 0.5f * mProcVar0.field_0x3008 * mProcVar0.field_0x3008)
/ mProcVar0.field_0x3008;
} else {
mProcVar0.field_0x3008--;
@@ -7759,7 +7759,7 @@ int daAlink_c::procWolfChainWaitInit() {
chain->onRide();
field_0x2f99 = 0x50;
current.pos = chain->getTopPos();
setSpecialGravity(0.0f, mMaxFallSpeed, 0);
setSpecialGravity(0.0f, maxFallSpeed, 0);
speed.y = 0.0f;
mProcVar3.field_0x300e.y = 0;
mProcVar0.field_0x3008 = daAlinkHIO_wlChain_c0::m.field_0x3C + 20;
src/d/a/d_a_itembase.cpp
+5 -5
View File
@@ -166,17 +166,17 @@ void daItemBase_c::settingBeforeDraw() {
/* 80144D18-80144D70 13F658 0058+00 1/0 0/0 8/0 .text setTevStr__12daItemBase_cFv */
void daItemBase_c::setTevStr() {
g_env_light.settingTevStruct(0, &current.pos, &mTevStr);
g_env_light.setLightTevColorType_MAJI(mpModel, &mTevStr);
g_env_light.settingTevStruct(0, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
}
/* 80144D70-80144EDC 13F6B0 016C+00 1/0 1/0 9/1 .text setShadow__12daItemBase_cFv */
void daItemBase_c::setShadow() {
f32 scale = mScale.x * getShadowSize();
f32 size = scale.x * getShadowSize();
if (!chkFlag(0x10)) {
if (getShadowSize() != 0.0f) {
dComIfGd_setSimpleShadow(&current.pos, mAcch.GetGroundH(), scale, mAcch.m_gnd, 0, 1.0f,
dComIfGd_setSimpleShadow(&current.pos, mAcch.GetGroundH(), size, mAcch.m_gnd, 0, 1.0f,
dDlst_shadowControl_c::getSimpleTex());
}
} else {
@@ -186,7 +186,7 @@ void daItemBase_c::setShadow() {
}
field_0x91c = dComIfGd_setShadow(field_0x91c, 3, mpModel, &current.pos, shadowSize, 0.0f,
current.pos.y, mAcch.GetGroundH(), mAcch.m_gnd, &mTevStr,
current.pos.y, mAcch.GetGroundH(), mAcch.m_gnd, &tevStr,
0, 1.0f, dDlst_shadowControl_c::getSimpleTex());
}
}
src/d/a/d_a_no_chg_room.cpp
+8 -8
View File
@@ -66,9 +66,9 @@ int daNocrm_c::execute() {
cXyz sp14;
mDoMtx_multVec(mInvMtx, &cur_player_pos, &sp14);
if (sp14.y < 0.0f || sp14.y > mScale.y || fabsf(sp14.x) > mScale.x || fabsf(sp14.z) > mScale.z)
if (sp14.y < 0.0f || sp14.y > scale.y || fabsf(sp14.x) > scale.x || fabsf(sp14.z) > scale.z)
{
if (mSubtype == 0 || !mRoomLoading ||
if (subtype == 0 || !mRoomLoading ||
dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()) != 0)
{
return 1;
@@ -79,7 +79,7 @@ int daNocrm_c::execute() {
return 1;
}
sp14.z = sp14.z < 0.0f ? -mScale.z : mScale.z;
sp14.z = sp14.z < 0.0f ? -scale.z : scale.z;
cXyz new_player_pos;
mDoMtx_multVec(mMtx, &sp14, &new_player_pos);
@@ -88,7 +88,7 @@ int daNocrm_c::execute() {
player_p->shape_angle.y, 1);
}
if (mSubtype == 0) {
if (subtype == 0) {
dStage_roomControl_c::setRoomReadId(getReadRoomId());
} else {
dStage_roomControl_c::onNoChangeRoom();
@@ -101,9 +101,9 @@ int daNocrm_c::execute() {
/* 80145508-801455A8 13FE48 00A0+00 1/1 0/0 0/0 .text getRoomNo__9daNocrm_cFi */
int daNocrm_c::getRoomNo(int param_0) {
if (mRoomNo[param_0] < 0) {
f32 z_offset = param_0 ? -mScale.z : mScale.z;
f32 z_offset = param_0 ? -scale.z : scale.z;
cXyz offset(0.0f, mScale.y, z_offset);
cXyz offset(0.0f, scale.y, z_offset);
cXyz check_pos;
mDoMtx_multVec(mMtx, &offset, &check_pos);
@@ -120,7 +120,7 @@ int daNocrm_c::getRoomNo(int param_0) {
}
int daNocrm_c::create() {
if (mSubtype == 0 && getReadRoomId() < 0) {
if (subtype == 0 && getReadRoomId() < 0) {
// "Room Load Rectangle: Load ID is -1, so destroy self!\n"
OSReport_Warning("部屋読み込み矩形：読み込みＩＤが−１ですので、自滅します！\n");
return cPhs_ERROR_e;
@@ -131,7 +131,7 @@ int daNocrm_c::create() {
cMtx_copy(mDoMtx_stack_c::get(), mMtx);
cMtx_inverse(mDoMtx_stack_c::get(), mInvMtx);
mScale *= getScaleType() ? 1000.0f : 100.0f;
scale *= getScaleType() ? 1000.0f : 100.0f;
mRoomNo[0] = -1;
mRoomNo[1] = -1;
return cPhs_COMPLEATE_e;
src/d/a/d_a_npc.cpp
+61 -61
View File
@@ -1801,26 +1801,26 @@ int daNpcT_c::draw(int param_0, int i_setEffMtx, f32 param_2, GXColorS10* i_colo
return 1;
}
mTevStr.mFogColor.r = 0;
mTevStr.mFogColor.g = 0;
mTevStr.mFogColor.b = 0;
mTevStr.mFogColor.a = 0;
tevStr.mFogColor.r = 0;
tevStr.mFogColor.g = 0;
tevStr.mFogColor.b = 0;
tevStr.mFogColor.a = 0;
if (i_color != NULL) {
mTevStr.mFogColor.r = i_color->r;
mTevStr.mFogColor.g = i_color->g;
mTevStr.mFogColor.b = i_color->b;
mTevStr.mFogColor.a = i_color->a;
tevStr.mFogColor.r = i_color->r;
tevStr.mFogColor.g = i_color->g;
tevStr.mFogColor.b = i_color->b;
tevStr.mFogColor.a = i_color->a;
}
if (field_0xdb8 != 0 && mTimer != 0) {
f32 r = (f32)mTimer / (f32)field_0xdb8;
if (cM3d_IsZero(r) == false) {
mTevStr.mFogColor.r = r * 20.0f;
tevStr.mFogColor.r = r * 20.0f;
}
} else if (param_0 != 0) {
mTevStr.mFogColor.g = 20;
tevStr.mFogColor.g = 20;
}
if (field_0xd98 & 0x800) {
@@ -1846,14 +1846,14 @@ int daNpcT_c::draw(int param_0, int i_setEffMtx, f32 param_2, GXColorS10* i_colo
if (i_drawGhost) {
drawGhost();
} else if (field_0xa89 != 0) {
g_env_light.settingTevStruct(4, &current.pos, &mTevStr);
g_env_light.setLightTevColorType_MAJI(model->getModelData(), &mTevStr);
g_env_light.settingTevStruct(4, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(model->getModelData(), &tevStr);
dComIfGd_setListDark();
mMcaMorfAnm[0]->entryDL();
dComIfGd_setList();
} else {
g_env_light.settingTevStruct(0, &current.pos, &mTevStr);
g_env_light.setLightTevColorType_MAJI(model->getModelData(), &mTevStr);
g_env_light.settingTevStruct(0, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(model->getModelData(), &tevStr);
mMcaMorfAnm[0]->entryDL();
}
@@ -1876,7 +1876,7 @@ int daNpcT_c::draw(int param_0, int i_setEffMtx, f32 param_2, GXColorS10* i_colo
if (param_6 == 0) {
if (param_7 == 0) {
field_0xd94 = dComIfGd_setShadow(field_0xd94, 1, model, &current.pos, param_2, param_4,
current.pos.y, field_0xdf4, field_0x930, &mTevStr, 0,
current.pos.y, field_0xdf4, field_0x930, &tevStr, 0,
1.0f, dDlst_shadowControl_c::getSimpleTex());
} else {
dComIfGd_setSimpleShadow(&current.pos, field_0xdf4, param_4, field_0x930, 0, 1.0f,
@@ -1901,8 +1901,8 @@ asm int daNpcT_c::draw(int param_0, int param_1, f32 param_2, _GXColorS10* param
/* 80148C70-80148CCC 1435B0 005C+00 1/1 0/0 58/58 .text setEnvTevColor__8daNpcT_cFv */
void daNpcT_c::setEnvTevColor() {
mTevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(field_0x930);
mTevStr.mRoomNo = dComIfG_Bgsp().GetRoomId(field_0x930);
tevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(field_0x930);
tevStr.mRoomNo = dComIfG_Bgsp().GetRoomId(field_0x930);
}
/* 80148CCC-80148D10 14360C 0044+00 1/1 0/0 58/58 .text setRoomNo__8daNpcT_cFv */
@@ -2109,7 +2109,7 @@ void daNpcT_c::setMtx() {
mDoMtx_stack_c::transS(current.pos);
mDoMtx_stack_c::ZXYrotM(field_0xd78);
mDoMtx_stack_c::scaleM(mScale);
mDoMtx_stack_c::scaleM(scale);
model->i_setBaseTRMtx(mDoMtx_stack_c::get());
model->setUserArea((u32)this);
@@ -2198,21 +2198,21 @@ int daNpcT_c::ctrlMsgAnm(int* param_0, int* param_1, fopAc_ac_c* param_2, int pa
*param_0 = -1;
*param_1 = -1;
if (param_3 != 0 || mEvtInfo.checkCommandTalk() || field_0xdac != -1) {
if (param_3 != 0 || eventInfo.checkCommandTalk() || field_0xdac != -1) {
fopAc_ac_c* talk_partner = dComIfGp_event_getTalkPartner();
dMsgObject_c* talk_partner_conv = (dMsgObject_c*)talk_partner;
if (talk_partner == param_2) {
fopAc_ac_c* conv_actor = talk_partner_conv->getActor();
u16 actor_command = conv_actor->mEvtInfo.mCommand;
u16 actor_command = conv_actor->eventInfo.mCommand;
if (actor_command == 2 || actor_command == 3) {
mSubMtd = (profile_method_class*)-1;
sub_method = (profile_method_class*)-1;
} else if (actor_command == 6) {
if (conv_actor->mSubMtd != mSubMtd) {
if (conv_actor->sub_method != sub_method) {
*param_0 = dComIfGp_getMesgFaceAnimeAttrInfo();
*param_1 = dComIfGp_getMesgAnimeAttrInfo();
mSubMtd = conv_actor->mSubMtd;
sub_method = conv_actor->sub_method;
}
if (dMsgObject_c::isMouthCheck()) {
@@ -2226,10 +2226,10 @@ int daNpcT_c::ctrlMsgAnm(int* param_0, int* param_1, fopAc_ac_c* param_2, int pa
if (field_0xd98 & 0x4000) {
field_0xd98 &= ~0x4000;
}
mSubMtd = (profile_method_class*)-1;
sub_method = (profile_method_class*)-1;
}
} else {
mSubMtd = (profile_method_class*)-1;
sub_method = (profile_method_class*)-1;
if (field_0xdb4) {
field_0xdb4 = 1;
}
@@ -2301,9 +2301,9 @@ bool daNpcT_c::checkCullDraw() {
/* 8014A064-8014A0B0 1449A4 004C+00 1/0 1/0 60/0 .text twilight__8daNpcT_cFv */
void daNpcT_c::twilight() {
if (field_0xa89 != 0) {
mAttentionInfo.mFlags |= 0x400000;
attention_info.flags |= 0x400000;
field_0xe2b = 0;
mAttentionInfo.mFlags |= 0x800000;
attention_info.flags |= 0x800000;
setHitodamaPrtcl();
}
}
@@ -2367,7 +2367,7 @@ void daNpcT_c::setPos(cXyz i_pos) {
i_pos.y = dComIfG_Bgsp().GroundCross(&field_0x930);
current.pos = i_pos;
next.pos = current.pos;
old.pos = current.pos;
}
/* 8014A99C-8014AA18 1452DC 007C+00 0/0 0/0 29/29 .text setAngle__8daNpcT_cF5csXyz */
@@ -2376,7 +2376,7 @@ void daNpcT_c::setAngle(csXyz i_angle) {
shape_angle = current.angle;
field_0xd78 = current.angle;
field_0xd7e = field_0xd78;
next.angle = current.angle;
old.angle = current.angle;
}
/* 8014AA18-8014AA40 145358 0028+00 0/0 0/0 138/138 .text setAngle__8daNpcT_cFs */
@@ -2385,7 +2385,7 @@ void daNpcT_c::setAngle(s16 i_angle) {
shape_angle.y = current.angle.y;
field_0xd78.y = current.angle.y;
field_0xd7e.y = field_0xd78.y;
next.angle.y = current.angle.y;
old.angle.y = current.angle.y;
}
/* 8014AA40-8014AAD0 145380 0090+00 0/0 0/0 33/33 .text hitChk__8daNpcT_cFP12dCcD_GObjInfUl */
@@ -3568,7 +3568,7 @@ void daBaseNpc_c::attnSttsOn(int param_0, int param_1) {
tmp = 1;
}
mAttentionInfo.mFlags = tmp;
attention_info.flags = tmp;
}
/* 8014EFF0-8014EFF4 149930 0004+00 2/0 0/0 1/0 .text setParam__11daBaseNpc_cFv */
@@ -3582,7 +3582,7 @@ void daBaseNpc_c::orderEvent(int param_0, char* i_evtName) {
mEvtIdx = i_dComIfGp_getEventManager().getEventIdx(this, i_evtName, -1);
fopAcM_orderOtherEventId(this, mEvtIdx, -1, -1, 0, 1);
} else {
if ((mUnk >= 0 && mAttentionInfo.mFlags == 10) && (mEvtInfo.mCondition |= 1, param_0 != 0))
if ((mUnk >= 0 && attention_info.flags == 10) && (eventInfo.mCondition |= 1, param_0 != 0))
{
fopAcM_orderSpeakEvent(this, 0, 0);
}
@@ -3595,8 +3595,8 @@ void daBaseNpc_c::mainProc() {
/* 8014F0A0-8014F0FC 1499E0 005C+00 1/1 0/0 2/2 .text setEnvTevColor__11daBaseNpc_cFv */
void daBaseNpc_c::setEnvTevColor() {
mTevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mBgSPolyInfo);
mTevStr.mRoomNo = dComIfG_Bgsp().GetRoomId(mBgSPolyInfo);
tevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mBgSPolyInfo);
tevStr.mRoomNo = dComIfG_Bgsp().GetRoomId(mBgSPolyInfo);
}
/* 8014F0FC-8014F140 149A3C 0044+00 1/1 0/0 2/2 .text setRoomNo__11daBaseNpc_cFv */
@@ -3700,7 +3700,7 @@ void daBaseNpc_c::setMtx(int param_0) {
mDoMtx_stack_c::transS(current.pos);
mDoMtx_stack_c::ZXYrotM(field_0x91a);
mDoMtx_stack_c::scaleM(mScale);
mDoMtx_stack_c::scaleM(scale);
model->i_setBaseTRMtx(mDoMtx_stack_c::get());
@@ -4594,8 +4594,8 @@ BOOL daNpcF_c::execute() {
cLib_chaseF(&field_0x978, 0.0f, 1.0f);
setCollisions();
if (field_0x9f4 != 0) {
mAttentionInfo.mFlags |= 0x400000;
mAttentionInfo.mFlags |= 0x800000;
attention_info.flags |= 0x400000;
attention_info.flags |= 0x800000;
setHitodamaPrtcl();
}
field_0x8f6 = field_0x8f0;
@@ -4644,27 +4644,27 @@ BOOL daNpcF_c::draw(int param_0, int param_1, f32 param_2, _GXColorS10* param_3,
fVar1 = 0.0f;
}
if (cM3d_IsZero_inverted(fVar1)) {
mTevStr.mFogColor.r = (s16)(fVar1 * 20.0f);
mTevStr.mFogColor.g = 0;
tevStr.mFogColor.r = (s16)(fVar1 * 20.0f);
tevStr.mFogColor.g = 0;
} else if (param_0) {
mTevStr.mFogColor.g = 20;
mTevStr.mFogColor.r = 0;
tevStr.mFogColor.g = 20;
tevStr.mFogColor.r = 0;
} else if (param_3 != NULL) {
mTevStr.mFogColor.r = param_3->r;
mTevStr.mFogColor.g = param_3->g;
mTevStr.mFogColor.b = param_3->b;
mTevStr.mFogColor.a = param_3->a;
tevStr.mFogColor.r = param_3->r;
tevStr.mFogColor.g = param_3->g;
tevStr.mFogColor.b = param_3->b;
tevStr.mFogColor.a = param_3->a;
} else {
mTevStr.mFogColor.g = 0;
mTevStr.mFogColor.r = 0;
tevStr.mFogColor.g = 0;
tevStr.mFogColor.r = 0;
}
if (field_0x9f4) {
g_env_light.settingTevStruct(4, &current.pos, &mTevStr);
g_env_light.settingTevStruct(4, &current.pos, &tevStr);
} else {
g_env_light.settingTevStruct(0, &current.pos, &mTevStr);
g_env_light.settingTevStruct(0, &current.pos, &tevStr);
}
g_env_light.setLightTevColorType_MAJI(model->getModelData(), &mTevStr);
g_env_light.setLightTevColorType_MAJI(model->getModelData(), &tevStr);
if (!drawDbgInfo()) {
if (mAnmFlags & ANM_PLAY_BTP) {
@@ -4702,7 +4702,7 @@ BOOL daNpcF_c::draw(int param_0, int param_1, f32 param_2, _GXColorS10* param_3,
}
field_0x9a0 = dComIfGd_setShadow(field_0x9a0, true, model, &current.pos, param_2, 20.0f,
current.pos.y, field_0x980, field_0xa44, &mTevStr, 0,
current.pos.y, field_0x980, field_0xa44, &tevStr, 0,
1.0f, dDlst_shadowControl_c::getSimpleTex());
drawOtherMdls();
@@ -5228,17 +5228,17 @@ asm void daNpcF_c::setDamage(int param_0, int param_1, int param_2) {
int daNpcF_c::ctrlMsgAnm(int& expression, int& motion, fopAc_ac_c* param_2, int param_3) {
expression = -1;
motion = -1;
if (param_3 || mEvtInfo.checkCommandTalk() || mCutIndex != -1) {
if (param_3 || eventInfo.checkCommandTalk() || mCutIndex != -1) {
fopAc_ac_c* talkPartner = dComIfGp_event_getTalkPartner();
if (talkPartner == param_2) {
fopAc_ac_c* actor = dMsgObject_c::getActor();
if (actor->mEvtInfo.mCommand == 2 || actor->mEvtInfo.mCommand == 3) {
if (actor->eventInfo.mCommand == 2 || actor->eventInfo.mCommand == 3) {
field_0x9a4 = (profile_method_class*)-1;
} else if (actor->mEvtInfo.mCommand == 6) {
if (actor->mSubMtd != field_0x9a4) {
} else if (actor->eventInfo.mCommand == 6) {
if (actor->sub_method != field_0x9a4) {
expression = dComIfGp_getMesgFaceAnimeAttrInfo();
motion = dComIfGp_getMesgAnimeAttrInfo();
field_0x9a4 = actor->mSubMtd;
field_0x9a4 = actor->sub_method;
}
if (dMsgObject_c::isMouthCheck()) {
mAnmFlags &= ~ANM_PAUSE_EXPRESSION;
@@ -5508,7 +5508,7 @@ fopAc_ac_c* daNpcF_c::getAttnActorP(int param_0, void* (*param_1)(void*, void*),
mFindCount = 0;
fpcEx_Search((fpcLyIt_JudgeFunc)param_1, this);
for (int i = 0; i < mFindCount; i++) {
if (chkPointInArea(getAttentionPos(mFindActorPList[i]), mAttentionInfo.mPosition,
if (chkPointInArea(getAttentionPos(mFindActorPList[i]), attention_info.position,
param_2, param_3, param_4, 0) &&
chkActorInSight2(mFindActorPList[i], param_5, param_6))
{
@@ -5634,7 +5634,7 @@ BOOL daNpcF_c::chkPointInArea(cXyz param_0, cXyz param_1, cXyz param_2, s16 para
/* 8015496C-801549E0 14F2AC 0074+00 3/3 0/0 0/0 .text getAttentionPos__8daNpcF_cFP10fopAc_ac_c */
cXyz daNpcF_c::getAttentionPos(fopAc_ac_c* i_ActorP) {
cXyz pos = i_ActorP->mAttentionInfo.mPosition;
cXyz pos = i_ActorP->attention_info.position;
if (fopAcM_GetName(i_ActorP) == PROC_ALINK) {
pos.y -= daPy_py_c::getAttentionOffsetY();
@@ -5674,9 +5674,9 @@ void daNpcF_c::setHitodamaPrtcl() {
field_0x9b8.x *= cM_scos(shape_angle.y);
field_0x9d2 += 0x400;
local_20.x = mEyePos.x + field_0x9b8.x + field_0x9c4.x;
local_20.y = mEyePos.y + field_0x9b8.y + field_0x9c4.y;
local_20.z = mEyePos.z + field_0x9b8.z + field_0x9c4.z;
local_20.x = eyePos.x + field_0x9b8.x + field_0x9c4.x;
local_20.y = eyePos.y + field_0x9b8.y + field_0x9c4.y;
local_20.z = eyePos.z + field_0x9b8.z + field_0x9c4.z;
for (int i = 0; i < 2; i++) {
field_0x9a8[i] =
src/d/a/d_a_npc_cd.cpp
+2 -2
View File
@@ -701,8 +701,8 @@ int daNpcCd_c::removeResrc(int idx, int param_1) {
/* 80156D1C-80156D78 15165C 005C+00 0/0 0/0 1/1 .text setEnvTevCol__9daNpcCd_cFv */
void daNpcCd_c::setEnvTevCol() {
mTevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mAcch.m_gnd);
mTevStr.mRoomNo = dComIfG_Bgsp().GetRoomId(mAcch.m_gnd);
tevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mAcch.m_gnd);
tevStr.mRoomNo = dComIfG_Bgsp().GetRoomId(mAcch.m_gnd);
}
/* 80156D78-80156DBC 1516B8 0044+00 0/0 0/0 1/1 .text setRoomNo__9daNpcCd_cFv */
src/d/a/d_a_npc_cd2.cpp
+6 -6
View File
@@ -1809,8 +1809,8 @@ int daNpcCd2_c::removeResrc(int idx, int param_1) {
/* 80158D88-80158DE4 1536C8 005C+00 0/0 0/0 4/4 .text setEnvTevCol__10daNpcCd2_cFv */
void daNpcCd2_c::setEnvTevCol() {
mTevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mAcch.m_gnd);
mTevStr.mRoomNo = dComIfG_Bgsp().GetRoomId(mAcch.m_gnd);
tevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mAcch.m_gnd);
tevStr.mRoomNo = dComIfG_Bgsp().GetRoomId(mAcch.m_gnd);
}
/* 80158DE4-80158E28 153724 0044+00 0/0 0/0 4/4 .text setRoomNo__10daNpcCd2_cFv */
@@ -1872,7 +1872,7 @@ int daNpcCd2_c::drawObj(int idx, J3DModel* i_model, f32 i_scale) {
u32 x = !isM_();
s32 jntNum = a_jntNumTbl[idx][x];
if (i_model && jntNum >= 0) {
g_env_light.setLightTevColorType_MAJI(i_model, &mTevStr);
g_env_light.setLightTevColorType_MAJI(i_model, &tevStr);
mDoMtx_copy(mpMorf->getModel()->i_getAnmMtx(jntNum), mDoMtx_stack_c::now);
mDoMtx_stack_c::scaleM(i_scale, i_scale, i_scale);
i_model->i_setBaseTRMtx(mDoMtx_stack_c::now);
@@ -1894,15 +1894,15 @@ asm int daNpcCd2_c::drawObj(int param_0, J3DModel* param_1, f32 param_2) {
/* 801590FC-80159258 153A3C 015C+00 0/0 0/0 4/4 .text drawNpc__10daNpcCd2_cFv */
int daNpcCd2_c::drawNpc() {
if (field_0xac6) {
g_env_light.settingTevStruct(4, &current.pos, &mTevStr);
g_env_light.settingTevStruct(4, &current.pos, &tevStr);
} else {
g_env_light.settingTevStruct(0, &current.pos, &mTevStr);
g_env_light.settingTevStruct(0, &current.pos, &tevStr);
}
if (field_0xac6 && !daPy_py_c::checkNowWolfEyeUp()) {
setHitodamaParticle();
return 1;
}
g_env_light.setLightTevColorType_MAJI(mpMorf->getModel(), &mTevStr);
g_env_light.setLightTevColorType_MAJI(mpMorf->getModel(), &tevStr);
if (field_0xac6) {
dComIfGd_setListDark();
}
src/d/a/d_a_obj.cpp
+4 -4
View File
@@ -24,7 +24,7 @@ void eff_break_tsubo(fopAc_ac_c* i_actor, cXyz i_scale, int i_type) {
dPa_name::ZI_J_M_tuboHahen_e, &i_actor->current.pos, NULL, NULL, 0xFF,
(dPa_modelEcallBack*)&dPa_modelEcallBack::mEcallback, roomNo, NULL, NULL, &i_scale);
dPa_modelEcallBack::setModel(emitter, tubo_bmd, i_actor->mTevStr, 3, tubo_btp, 0, i_type);
dPa_modelEcallBack::setModel(emitter, tubo_bmd, i_actor->tevStr, 3, tubo_btp, 0, i_type);
s32 roomNo2 = fopAcM_GetRoomNo(i_actor);
dComIfGp_particle_set(dPa_name::ZI_J_tuboHahen_e, &i_actor->current.pos, NULL, NULL, 0xFF,
@@ -97,7 +97,7 @@ void posMoveF_grade_acc(cXyz* pos, const fopAc_ac_c* i_actor, cXyz const* param_
if (param_2 != NULL) {
cXyz sp28(*param_5);
sp28.y += i_actor->mGravity;
sp28.y += i_actor->gravity;
if (param_6 != NULL) {
sp28 += *param_6;
@@ -136,10 +136,10 @@ void posMoveF_grade(fopAc_ac_c* i_actor, cXyz const* param_1, cXyz const* stream
f32 speedF = fopAcM_GetSpeedF(i_actor);
f32 gravity = fopAcM_GetGravity(i_actor);
cXyz& speed_p = fopAcM_GetSpeed_p(i_actor);
cXyz* speed_p = fopAcM_GetSpeed_p(i_actor);
f32 speed_x = spB8.x + (spAC.x + (speedF * cM_ssin(i_actor->current.angle.y)));
f32 speed_y = spB8.y + (spAC.y + (speed_p.y + gravity));
f32 speed_y = spB8.y + (spAC.y + (speed_p->y + gravity));
f32 speed_z = spB8.z + (spAC.z + (speedF * cM_scos(i_actor->current.angle.y)));
if (param_8 != NULL) {
src/d/a/d_a_obj_item.cpp
+28 -28
View File
@@ -251,7 +251,7 @@ const daItemBase_data& daItemBase_c::getData() {
/* 8015B0C4-8015B108 155A04 0044+00 1/1 0/0 0/0 .text initBaseMtx__8daItem_cFv */
void daItem_c::initBaseMtx() {
if (mpModel != NULL) {
mpModel->setBaseScale(mScale);
mpModel->setBaseScale(scale);
setBaseMtx();
}
}
@@ -259,7 +259,7 @@ void daItem_c::initBaseMtx() {
/* 8015B108-8015B190 155A48 0088+00 2/2 0/0 0/0 .text setBaseMtx__8daItem_cFv */
void daItem_c::setBaseMtx() {
if (mpModel != NULL) {
mpModel->setBaseScale(mScale);
mpModel->setBaseScale(scale);
switch (m_itemNo) {
case GREEN_RUPEE:
@@ -295,7 +295,7 @@ SECTION_SDATA2 static f32 lit_3923 = 0.5f;
#ifdef NONMATCHING
void daItem_c::setBaseMtx_1() {
f32 max_y = mpModel->getModelData()->getJointNodePointer(0)->getMax()->y;
f32 y = (max_y / 2) * mScale.y;
f32 y = (max_y / 2) * scale.y;
mDoMtx_stack_c::transS(current.pos);
mDoMtx_stack_c::transM(0.0f, y, 0.0f);
@@ -547,7 +547,7 @@ SECTION_SDATA2 static f64 lit_4072 = 4503599627370496.0 /* cast u32 to float */;
#ifdef NONMATCHING
void daItem_c::CreateInit() {
mAcchCir.SetWall(30.0f, 30.0f);
mAcch.Set(&current.pos, &next.pos, this, 1, &mAcchCir, &speed, NULL, NULL);
mAcch.Set(&current.pos, &old.pos, this, 1, &mAcchCir, &speed, NULL, NULL);
mAcch.ClrWaterNone();
mAcch.ClrRoofNone();
mAcch.SetWtrChkMode(2);
@@ -562,9 +562,9 @@ void daItem_c::CreateInit() {
f32 cylHeight = dItem_data::getH(m_itemNo);
f32 cylRadius = dItem_data::getR(m_itemNo);
if (mScale.x > 1.0f) {
cylHeight *= mScale.x;
cylRadius *= mScale.x;
if (scale.x > 1.0f) {
cylHeight *= scale.x;
cylRadius *= scale.x;
}
mCollider.SetR(cylRadius);
@@ -623,7 +623,7 @@ void daItem_c::CreateInit() {
mAcch.CrrPos(dComIfG_Bgsp());
if (mAcch.ChkWaterHit() && mAcch.m_wtr.GetHeight() > orig.pos.y + 150.0f) {
if (mAcch.ChkWaterHit() && mAcch.m_wtr.GetHeight() > home.pos.y + 150.0f) {
field_0x9c0 = 1;
}
@@ -746,10 +746,10 @@ int daItem_c::_daItem_create() {
fopAcM_SetupActor(this, daItem_c);
if (!field_0x95d) {
field_0x92c = orig.angle.x;
field_0x92e = orig.angle.z;
orig.angle.z = 0;
orig.angle.x = 0;
field_0x92c = home.angle.x;
field_0x92e = home.angle.z;
home.angle.z = 0;
home.angle.x = 0;
current.angle.z = 0;
current.angle.x = 0;
shape_angle.z = 0;
@@ -822,10 +822,10 @@ int daItem_c::_daItem_execute() {
field_0x950 = speed;
CountTimer();
mEyePos = current.pos;
mEyePos.y += (f32)dItem_data::getH(m_itemNo) / 2;
eyePos = current.pos;
eyePos.y += (f32)dItem_data::getH(m_itemNo) / 2;
mAttentionInfo.mPosition = current.pos;
attention_info.position = current.pos;
if (mCollider.ChkTgHit()) {
cCcD_Obj* hitObj = mCollider.GetTgHitObj();
@@ -919,14 +919,14 @@ void daItem_c::procInitNormal() {
void daItem_c::procMainNormal() {
move_proc_call();
if (mScale != field_0x930) {
if (scale != field_0x930) {
f32 chase_x = field_0x930.x / getData().field_0xc;
f32 chase_y = field_0x930.y / getData().field_0xc;
f32 chase_z = field_0x930.z / getData().field_0xc;
cLib_chaseF(&mScale.x, field_0x930.x, chase_x);
cLib_chaseF(&mScale.y, field_0x930.y, chase_y);
cLib_chaseF(&mScale.z, field_0x930.z, chase_z);
cLib_chaseF(&scale.x, field_0x930.x, chase_x);
cLib_chaseF(&scale.y, field_0x930.y, chase_y);
cLib_chaseF(&scale.z, field_0x930.z, chase_z);
}
if (field_0x942 == 0) {
@@ -974,7 +974,7 @@ void daItem_c::procInitSimpleGetDemo() {
current.pos.y += 15.0f;
shape_angle.z = 0;
shape_angle.x = 0;
mScale = field_0x930;
scale = field_0x930;
fopAcM_SetSpeed(this, 0, getData().field_0x2c, 0);
fopAcM_SetGravity(this, getData().field_0x30);
show();
@@ -1015,7 +1015,7 @@ void daItem_c::procInitGetDemoEvent() {
field_0x9c1 = 10;
fopAcM_orderItemEvent(this, 0, 0);
mEvtInfo.i_onCondition(dEvtCnd_CANGETITEM_e);
eventInfo.i_onCondition(dEvtCnd_CANGETITEM_e);
m_item_id = fopAcM_createItemForTrBoxDemo(&current.pos, m_itemNo, -1, fopAcM_GetRoomNo(this),
NULL, NULL);
@@ -1025,7 +1025,7 @@ void daItem_c::procInitGetDemoEvent() {
/* 8015C2A4-8015C3BC 156BE4 0118+00 1/0 0/0 0/0 .text procWaitGetDemoEvent__8daItem_cFv
*/
void daItem_c::procWaitGetDemoEvent() {
if (mEvtInfo.checkCommandItem()) {
if (eventInfo.checkCommandItem()) {
setStatus(4);
if (m_item_id != -1) {
dComIfGp_event_setItemPartnerId(m_item_id);
@@ -1033,7 +1033,7 @@ void daItem_c::procWaitGetDemoEvent() {
} else {
if (m_itemNo == BOOMERANG) {
fopAcM_orderItemEvent(this, 0, 0);
mEvtInfo.i_onCondition(dEvtCnd_CANGETITEM_e);
eventInfo.i_onCondition(dEvtCnd_CANGETITEM_e);
return;
}
@@ -1048,7 +1048,7 @@ void daItem_c::procWaitGetDemoEvent() {
}
} else {
fopAcM_orderItemEvent(this, 0, 0);
mEvtInfo.i_onCondition(dEvtCnd_CANGETITEM_e);
eventInfo.i_onCondition(dEvtCnd_CANGETITEM_e);
}
}
}
@@ -1114,7 +1114,7 @@ void daItem_c::procMainSwOnWait() {
if (i_fopAcM_isSwitch(this, field_0x93c)) {
mAcch.CrrPos(dComIfG_Bgsp());
if (mAcch.ChkWaterHit() && mAcch.m_wtr.GetHeight() > lit_4070[0] + orig.pos.y) {
if (mAcch.ChkWaterHit() && mAcch.m_wtr.GetHeight() > lit_4070[0] + home.pos.y) {
field_0x9c0 = 1;
}
@@ -1187,7 +1187,7 @@ void daItem_c::mode_water_init() {
shape_angle.z = 0;
shape_angle.x = 0;
field_0x940 = 0;
mScale = field_0x930;
scale = field_0x930;
}
/* 8015CCD0-8015CDCC 157610 00FC+00 1/0 0/0 0/0 .text mode_wait__8daItem_cFv */
@@ -1284,8 +1284,8 @@ asm void daItem_c::mode_water() {
/* 8015CE94-8015CEEC 1577D4 0058+00 1/0 0/0 0/0 .text setTevStr__8daItem_cFv */
void daItem_c::setTevStr() {
g_env_light.settingTevStruct(0, &current.pos, &mTevStr);
g_env_light.setLightTevColorType_MAJI(mpModel, &mTevStr);
g_env_light.settingTevStruct(0, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
}
/* 8015CEEC-8015D0A8 15782C 01BC+00 6/6 0/0 0/0 .text itemGetNextExecute__8daItem_cFv */
src/d/bg/d_bg_s_acch.cpp
+5 -5
View File
@@ -124,11 +124,11 @@ void dBgS_Acch::Set(fopAc_ac_c* i_actor, int i_tbl_size, dBgS_AcchCir* i_acchcir
m_my_ac = i_actor;
SetActorPid(fopAcM_GetID(i_actor));
pm_pos = &fopAcM_GetPosition_p(i_actor);
pm_old_pos = &fopAcM_GetOldPosition_p(i_actor);
pm_speed = &fopAcM_GetSpeed_p(i_actor);
pm_angle = &fopAcM_GetAngle_p(i_actor);
pm_shape_angle = &fopAcM_GetShapeAngle_p(i_actor);
pm_pos = fopAcM_GetPosition_p(i_actor);
pm_old_pos = fopAcM_GetOldPosition_p(i_actor);
pm_speed = fopAcM_GetSpeed_p(i_actor);
pm_angle = fopAcM_GetAngle_p(i_actor);
pm_shape_angle = fopAcM_GetShapeAngle_p(i_actor);
}
/* 800762D8-80076350 070C18 0078+00 1/1 0/0 0/0 .text GroundCheckInit__9dBgS_AcchFR4dBgS
src/d/bg/d_bg_s_movebg_actor.cpp
+2 -2
View File
@@ -107,7 +107,7 @@ int dBgS_MoveBgActor::MoveBGCreate(char const* i_arcName, int i_dzb_id,
if (i_bgMtx == NULL) {
mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
mDoMtx_stack_c::YrotM(shape_angle.y);
mDoMtx_stack_c::scaleM(mScale.x, mScale.y, mScale.z);
mDoMtx_stack_c::scaleM(scale.x, scale.y, scale.z);
MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
} else {
MTXCopy(*i_bgMtx, mBgMtx);
@@ -147,7 +147,7 @@ int dBgS_MoveBgActor::MoveBGExecute() {
if (new_mtx == NULL) {
mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
mDoMtx_stack_c::YrotM(shape_angle.y);
mDoMtx_stack_c::scaleM(mScale.x, mScale.y, mScale.z);
mDoMtx_stack_c::scaleM(scale.x, scale.y, scale.z);
MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
} else {
MTXCopy(*new_mtx, mBgMtx);
src/d/cc/d_cc_s.cpp
+1 -1
View File
@@ -165,7 +165,7 @@ bool dCcS::ChkShieldFrontRange(cCcD_Obj* i_atObj, cCcD_Obj* i_tgObj, int param_2
if (tgObj->GetTgShieldFrontRangeYAngle() != NULL) {
var_r4 = *tgObj->GetTgShieldFrontRangeYAngle();
} else {
var_r4 = fopAcM_GetShapeAngle_p(tgActor).y;
var_r4 = fopAcM_GetShapeAngle_p(tgActor)->y;
}
s16 shield_range = tgObj->GetTgShieldRange();
src/d/cc/d_cc_uty.cpp
+3 -3
View File
@@ -444,13 +444,13 @@ fopAc_ac_c* cc_at_check(fopAc_ac_c* i_enemy, dCcU_AtInfo* i_AtInfo) {
}
if (i_AtInfo->mAttackPower != 0) {
i_enemy->mHealth -= i_AtInfo->mAttackPower;
i_enemy->health -= i_AtInfo->mAttackPower;
}
s8 pause_time = 0;
if (i_AtInfo->mAttackPower != 0 && i_enemy->mHealth <= 0) {
if (i_AtInfo->mAttackPower != 0 && i_enemy->health <= 0) {
i_AtInfo->mHitStatus = 2;
i_enemy->mHealth = 0;
i_enemy->health = 0;
}
int uvar8;
src/d/com/d_com_static.cpp
+3 -3
View File
@@ -192,7 +192,7 @@ u8 daSus_c::data_c::check(fopAc_ac_c* i_actor) {
u8 tmp = 0x80;
if (check(i_actor->orig.pos)) {
if (check(i_actor->home.pos)) {
tmp |= 1;
}
@@ -473,8 +473,8 @@ SECTION_SDATA2 f32 daDsh_c::CLOSE_BOUND_RATIO = -0.4f;
int daTagStream_c::checkArea(cXyz const* param_0) {
cXyz relativePos;
fpoAcM_relativePos(this, param_0, &relativePos);
if (relativePos.y >= 0.0f && relativePos.y <= mScale.y && fabsf(relativePos.x) <= mScale.x &&
fabsf(relativePos.z) <= mScale.z)
if (relativePos.y >= 0.0f && relativePos.y <= scale.y && fabsf(relativePos.x) <= scale.x &&
fabsf(relativePos.z) <= scale.z)
{
return 1;
}
src/d/d_attention.cpp
+42 -42
View File
@@ -509,7 +509,7 @@ dAttList_c* dAttention_c::getActionBtnB() {
dAttList_c* list = GetLockonList(0);
if (list != NULL && list->getActor() != NULL && list->mType == 1 && LockonTruth() &&
!(list->getActor()->mAttentionInfo.mFlags & 0x2000000)) {
!(list->getActor()->attention_info.flags & 0x2000000)) {
return list;
}
@@ -519,7 +519,7 @@ dAttList_c* dAttention_c::getActionBtnB() {
for (i = 0; i < mActionCount; i++) {
if (mActionList[i].mType == 3) {
if (!(mActionList[i].getActor()->mAttentionInfo.mFlags & 0x2000000)) {
if (!(mActionList[i].getActor()->attention_info.flags & 0x2000000)) {
return &mActionList[i];
}
continue;
@@ -536,7 +536,7 @@ dAttList_c* dAttention_c::getActionBtnXY() {
dAttList_c* list = GetLockonList(0);
if (list != NULL && list->getActor() != NULL && list->mType == 1 && LockonTruth()) {
if (list->getActor()->mEvtInfo.chkCondition(dEvtCnd_CANTALKITEM_e)) {
if (list->getActor()->eventInfo.chkCondition(dEvtCnd_CANTALKITEM_e)) {
return list;
}
@@ -549,7 +549,7 @@ dAttList_c* dAttention_c::getActionBtnXY() {
for (i = 0; i < mActionCount; i++) {
if (mActionList[i].mType == 3) {
if (mActionList[i].getActor()->mEvtInfo.chkCondition(dEvtCnd_CANTALKITEM_e)) {
if (mActionList[i].getActor()->eventInfo.chkCondition(dEvtCnd_CANTALKITEM_e)) {
return &mActionList[i];
}
}
@@ -795,16 +795,16 @@ f32 dAttention_c::calcWeight(int param_0, fopAc_ac_c* param_1, f32 param_2, s16
f32 dvar12;
type_tbl_entry* entry = &table[i];
if (mPlayerAttentionFlags & entry->field_0x2 & param_1->mAttentionInfo.mFlags) {
u8 index = param_1->mAttentionInfo.field_0x0[entry->field_0x0];
if (mPlayerAttentionFlags & entry->field_0x2 & param_1->attention_info.flags) {
u8 index = param_1->attention_info.field_0x0[entry->field_0x0];
dist_entry* d_entry = &dist_table[index];
if (fopAcM_checkStatus(param_1, 0x20000000) ||
check_event_condition(entry->field_0x0, param_1->mEvtInfo.getCondition())) {
check_event_condition(entry->field_0x0, param_1->eventInfo.getCondition())) {
dvar12 = 0.0f;
} else if (check_flontofplayer(d_entry->field_0x18, param_3, param_4)) {
dvar12 = 0.0f;
} else if (!check_distace(&mOwnerAttnPos, param_3, &param_1->mAttentionInfo.mPosition,
} else if (!check_distace(&mOwnerAttnPos, param_3, &param_1->attention_info.position,
d_entry->field_0x0, d_entry->field_0x8, d_entry->field_0xc,
d_entry->field_0x10)) {
dvar12 = 0.0f;
@@ -953,7 +953,7 @@ asm void dAttention_c::initList(u32 param_0) {
/* 8007138C-800713CC 06BCCC 0040+00 1/1 0/0 0/0 .text select_attention__FP10fopAc_ac_cPv
*/
static int select_attention(fopAc_ac_c* param_0, void* i_attention) {
if (param_0->mAttentionInfo.mFlags == 0) {
if (param_0->attention_info.flags == 0) {
return 0;
}
@@ -969,7 +969,7 @@ int dAttention_c::makeList() {
/* 80071424-80071488 06BD64 0064+00 1/1 0/0 0/0 .text setOwnerAttentionPos__12dAttention_cFv */
void dAttention_c::setOwnerAttentionPos() {
mOwnerAttnPos = mpPlayer->mAttentionInfo.mPosition;
mOwnerAttnPos = mpPlayer->attention_info.position;
if (fopAcM_GetName(mpPlayer) == PROC_ALINK) {
mOwnerAttnPos.y -= ((daPy_py_c*)mpPlayer)->getAttentionOffsetY();
@@ -984,21 +984,21 @@ int dAttention_c::SelectAttention(fopAc_ac_c* param_0) {
if (param_0 == mpPlayer || mpPlayer == NULL) {
return 0;
}
mPlayerAttentionFlags = mpPlayer->mAttentionInfo.mFlags;
cSGlobe acStack_40(param_0->mAttentionInfo.mPosition - mOwnerAttnPos);
acStack_4c = acStack_40.U() - fopAcM_GetShapeAngle_p(mpPlayer).y;
acStack_50 = cSAngle(acStack_40.U().Inv()) - fopAcM_GetShapeAngle_p(param_0).y;
mPlayerAttentionFlags = mpPlayer->attention_info.flags;
cSGlobe acStack_40(param_0->attention_info.position - mOwnerAttnPos);
acStack_4c = acStack_40.U() - fopAcM_GetShapeAngle_p(mpPlayer)->y;
acStack_50 = cSAngle(acStack_40.U().Inv()) - fopAcM_GetShapeAngle_p(param_0)->y;
u32 local_48;
if ((param_0->mAttentionInfo.mFlags & 7) != 0 && chkFlag(0x4000) == 0)
if ((param_0->attention_info.flags & 7) != 0 && chkFlag(0x4000) == 0)
{
f32 dVar5 = calcWeight(0x4c, param_0, acStack_40.R(), acStack_4c.Val(), acStack_50.Val(), &local_48);
setList(0x4c, param_0, dVar5, acStack_40.R(), acStack_4c, local_48);
}
if ((param_0->mAttentionInfo.mFlags & 0xf8) != 0) {
if ((param_0->attention_info.flags & 0xf8) != 0) {
f32 dVar5 = calcWeight(0x41, param_0, acStack_40.R(), acStack_4c.Val(), acStack_50.Val(), &local_48);
setList(0x41, param_0, dVar5, acStack_40.R(), acStack_4c, local_48);
}
if (((param_0->mAttentionInfo).mFlags & 0x100) != 0) {
if (((param_0->attention_info).flags & 0x100) != 0) {
f32 dVar5 = calcWeight(0x43, param_0, acStack_40.R(), acStack_4c.Val(), acStack_50.Val(), &local_48);
setList(0x43, param_0, dVar5, acStack_40.R(), acStack_4c, local_48);
}
@@ -1134,27 +1134,27 @@ bool dAttention_c::chaseAttention() {
}
if (!chkFlag(0x4000)) {
cSGlobe g1 = actor->mAttentionInfo.mPosition - mOwnerAttnPos;
cSGlobe g1 = actor->attention_info.position - mOwnerAttnPos;
cSAngle a1;
a1 = g1.U() - fopAcM_GetShapeAngle_p(mpPlayer).y;
a1 = g1.U() - fopAcM_GetShapeAngle_p(mpPlayer)->y;
cSGlobe g2(mOwnerAttnPos - actor->mAttentionInfo.mPosition);
cSGlobe g2(mOwnerAttnPos - actor->attention_info.position);
cSAngle a2;
a2 = g2.U() - fopAcM_GetShapeAngle_p(actor).y;
a2 = g2.U() - fopAcM_GetShapeAngle_p(actor)->y;
u32 type;
f32 weight = calcWeight(0x4C, actor, g1.R(), a1.Val(), a2.Val(), &type);
if (weight <= 0.0f) {
type = mLockOnList[offset].mType;
int tbl_idx = actor->mAttentionInfo.field_0x0[type];
int tbl_idx = actor->attention_info.field_0x0[type];
if (!chkAttMask(type, actor->mAttentionInfo.mFlags)) {
if (!chkAttMask(type, actor->attention_info.flags)) {
return false;
} else if (check_event_condition(type, actor->mEvtInfo.getCondition())) {
} else if (check_event_condition(type, actor->eventInfo.getCondition())) {
return false;
} else if (check_flontofplayer(dist_table[tbl_idx].field_0x18, a1.Val(), a2.Val())) {
return false;
} else if (check_distace(&mOwnerAttnPos, a1.Val(), &actor->mAttentionInfo.mPosition,
} else if (check_distace(&mOwnerAttnPos, a1.Val(), &actor->attention_info.position,
dist_table[tbl_idx].field_0x4, dist_table[tbl_idx].field_0x8,
dist_table[tbl_idx].field_0xc,
dist_table[tbl_idx].field_0x10)) {
@@ -1172,7 +1172,7 @@ bool dAttention_c::chaseAttention() {
return true;
}
return (actor->mAttentionInfo.mFlags & 7) != false;
return (actor->attention_info.flags & 7) != false;
}
#else
#pragma push
@@ -1196,12 +1196,12 @@ f32 dAttention_c::EnemyDistance(fopAc_ac_c* i_actor) {
distance = -1.0f;
} else if (fopAcM_GetProfName(i_actor) == PROC_ALINK) {
distance = -1.0f;
} else if (!(i_actor->mAttentionInfo.mFlags & 4) &&
!(i_actor->mAttentionInfo.mFlags & 0x4000000)) {
} else if (!(i_actor->attention_info.flags & 4) &&
!(i_actor->attention_info.flags & 0x4000000)) {
distance = -1.0f;
} else {
distance = fopAcM_searchActorDistance(mpPlayer, i_actor);
u8 tmp = i_actor->mAttentionInfo.field_0x0[2];
u8 tmp = i_actor->attention_info.field_0x0[2];
if (distance < dist_table[tmp].field_0x0 + dist_table[tmp].field_0x8) {
return distance;
@@ -1696,7 +1696,7 @@ void dAttention_c::Draw() {
if (!i_dComIfGp_event_runCheck()) {
if (target != NULL) {
draw[0].draw(target->mAttentionInfo.mPosition, tmp);
draw[0].draw(target->attention_info.position, tmp);
if (mLockonCount >= 2 && draw[1].field_0x173 == 2) {
int listIdx = mLockOnOffset;
@@ -1708,19 +1708,19 @@ void dAttention_c::Draw() {
}
if (mLockOnList[listIdx].getActor() != NULL) {
fopAc_ac_c* actor = mLockOnList[listIdx].getActor();
draw[1].draw(actor->mAttentionInfo.mPosition, tmp);
draw[1].draw(actor->attention_info.position, tmp);
}
}
mTargetActorID = fopAcM_GetID(target);
mDrawAttnPos = target->mAttentionInfo.mPosition;
mDrawAttnPos = target->attention_info.position;
field_0x328 = 0;
} else if (field_0x328 > 0) {
fopAc_ac_c* actor = fopAcM_SearchByID(mTargetActorID);
if (actor != NULL) {
draw[0].draw(actor->mAttentionInfo.mPosition, tmp);
mDrawAttnPos = actor->mAttentionInfo.mPosition;
draw[0].draw(actor->attention_info.position, tmp);
mDrawAttnPos = actor->attention_info.position;
} else {
draw[0].draw(mDrawAttnPos, tmp);
}
@@ -1941,7 +1941,7 @@ fopAc_ac_c* dAttention_c::LockonTarget(s32 param_0) {
}
fopAc_ac_c* actor = mLockOnList[listIdx].getActor();
if (actor == NULL || !(actor->mAttentionInfo.mFlags & 7)) {
if (actor == NULL || !(actor->attention_info.flags & 7)) {
return NULL;
}
@@ -1961,9 +1961,9 @@ f32 dAttention_c::LockonReleaseDistanse() {
return 0.0f;
}
int idx = actor->mAttentionInfo.field_0x0[mLockOnList[mLockOnOffset].mType];
cSGlobe tmp_g(actor->mAttentionInfo.mPosition - mOwnerAttnPos);
cSAngle tmp_a(tmp_g.U() - fopAcM_GetShapeAngle_p(mpPlayer).y);
int idx = actor->attention_info.field_0x0[mLockOnList[mLockOnOffset].mType];
cSGlobe tmp_g(actor->attention_info.position - mOwnerAttnPos);
cSAngle tmp_a(tmp_g.U() - fopAcM_GetShapeAngle_p(mpPlayer)->y);
return distace_angle_adjust(dist_table[idx].field_0x8, tmp_a, 1.0f) + dist_table[idx].field_0x4;
}
@@ -2122,7 +2122,7 @@ int dAttCatch_c::request(fopAc_ac_c* param_1, u8 param_2, f32 param_3, f32 param
if (param_7 > field_0x4) {
return 0;
}
cXyz acStack_48 = param_1->mAttentionInfo.mPosition - player->mAttentionInfo.mPosition;
cXyz acStack_48 = param_1->attention_info.position - player->attention_info.position;
if (acStack_48.y < param_5 || acStack_48.y > param_4) {
return 0;
}
@@ -2132,7 +2132,7 @@ int dAttCatch_c::request(fopAc_ac_c* param_1, u8 param_2, f32 param_3, f32 param
}
if (param_6 != 0) {
cSGlobe acStack_50(acStack_48);
s16 sVar5 = acStack_50.U() - fopAcM_GetShapeAngle_p((fopAc_ac_c*)player).y;
s16 sVar5 = acStack_50.U() - fopAcM_GetShapeAngle_p((fopAc_ac_c*)player)->y;
if (sVar5 < 0) {
sVar5 = -sVar5;
}
@@ -2192,7 +2192,7 @@ int dAttLook_c::request(fopAc_ac_c* param_1, f32 param_2, f32 param_3, f32 param
if (param_6 > field_0x4) {
return 0;
}
cXyz acStack_48 = param_1->mEyePos - player->mEyePos;
cXyz acStack_48 = param_1->eyePos - player->eyePos;
if (acStack_48.y < param_4 || acStack_48.y > param_3) {
return 0;
}
@@ -2203,7 +2203,7 @@ int dAttLook_c::request(fopAc_ac_c* param_1, f32 param_2, f32 param_3, f32 param
if (param_5 != 0) {
acStack_48 = param_1->current.pos - player->current.pos;
cSGlobe acStack_50(acStack_48);
s16 sVar5 = acStack_50.U() - fopAcM_GetShapeAngle_p(player).y;
s16 sVar5 = acStack_50.U() - fopAcM_GetShapeAngle_p(player)->y;
if (sVar5 < 0) {
sVar5 = -sVar5;
}
src/d/d_demo.cpp
+6 -6
View File
@@ -627,7 +627,7 @@ asm dDemo_actor_c::dDemo_actor_c() {
dDemo_actor_c::~dDemo_actor_c() {
fopAc_ac_c* actor = getActor();
if (actor != NULL) {
actor->mDemoActorId = 0;
actor->demoActorID = 0;
}
mActorId = -1;
@@ -779,7 +779,7 @@ SECTION_SDATA2 static f32 lit_4152 = -1.0f;
#ifdef NONMATCHING
int dDemo_setDemoData(fopAc_ac_c* param_0, u8 param_1, mDoExt_McaMorf* param_2, char const* param_3,
int param_4, u16* param_5, u32 param_6, s8 param_7) {
dDemo_actor_c* demo_actor = dDemo_c::getActor(param_0->mDemoActorId);
dDemo_actor_c* demo_actor = dDemo_c::getActor(param_0->demoActorID);
if (demo_actor == NULL) {
return 0;
@@ -788,7 +788,7 @@ int dDemo_setDemoData(fopAc_ac_c* param_0, u8 param_1, mDoExt_McaMorf* param_2,
u32 flags = demo_actor->checkEnable(param_1);
if (flags & 2) {
param_0->current.pos = demo_actor->getTrans();
param_0->next.pos = param_0->current.pos;
param_0->old.pos = param_0->current.pos;
}
if (flags & 8) {
@@ -800,7 +800,7 @@ int dDemo_setDemoData(fopAc_ac_c* param_0, u8 param_1, mDoExt_McaMorf* param_2,
}
if (flags & 0x80) {
param_0->mGravity = demo_actor->getPrm_Morf();
param_0->gravity = demo_actor->getPrm_Morf();
}
if (param_2 == NULL) {
@@ -1232,7 +1232,7 @@ dDemo_object_c::~dDemo_object_c() {
/* 80038FC0-80039088 033900 00C8+00 1/1 0/0 0/0 .text appendActor__14dDemo_object_cFP10fopAc_ac_c
*/
JStage::TObject* dDemo_object_c::appendActor(fopAc_ac_c* p_actor) {
dDemo_actor_c* demoActor = dDemo_c::getActor(p_actor->mDemoActorId);
dDemo_actor_c* demoActor = dDemo_c::getActor(p_actor->demoActorID);
if (demoActor != NULL) {
return demoActor;
@@ -1251,7 +1251,7 @@ JStage::TObject* dDemo_object_c::appendActor(fopAc_ac_c* p_actor) {
mActorNum++;
mpActors[curActorNum] = demoActor;
demoActor->setActor(p_actor);
p_actor->mDemoActorId = mActorNum;
p_actor->demoActorID = mActorNum;
if (p_actor->model != NULL) {
demoActor->setModel((J3DModel*)p_actor->model);
src/d/d_door_param2.cpp
+6 -6
View File
@@ -43,18 +43,18 @@ u32 door_param2_c::getBRoomNo(fopAc_ac_c* i_actor) {
/* 8003A1D0-8003A1DC 034B10 000C+00 0/0 0/0 25/25 .text getSwbit__13door_param2_cFP10fopAc_ac_c */
u32 door_param2_c::getSwbit(fopAc_ac_c* i_actor) {
return i_actor->orig.angle.z & 0xFF;
return i_actor->home.angle.z & 0xFF;
}
/* 8003A1DC-8003A1E8 034B1C 000C+00 0/0 0/0 12/12 .text getSwbit2__13door_param2_cFP10fopAc_ac_c
*/
u32 door_param2_c::getSwbit2(fopAc_ac_c* i_actor) {
return (i_actor->orig.angle.z >> 8) & 0xFF;
return (i_actor->home.angle.z >> 8) & 0xFF;
}
/* 8003A1E8-8003A1F4 034B28 000C+00 0/0 0/0 3/3 .text getSwbit3__13door_param2_cFP10fopAc_ac_c */
u32 door_param2_c::getSwbit3(fopAc_ac_c* i_actor) {
return (i_actor->orig.angle.x >> 8) & 0xFF;
return (i_actor->home.angle.x >> 8) & 0xFF;
}
/* 8003A1F4-8003A200 034B34 000C+00 0/0 0/0 4/4 .text isMsgDoor__13door_param2_cFP10fopAc_ac_c */
@@ -64,18 +64,18 @@ u32 door_param2_c::isMsgDoor(fopAc_ac_c* i_actor) {
/* 8003A200-8003A20C 034B40 000C+00 0/0 0/0 3/3 .text getEventNo__13door_param2_cFP10fopAc_ac_c */
u32 door_param2_c::getEventNo(fopAc_ac_c* i_actor) {
return i_actor->orig.angle.x & 0xFF;
return i_actor->home.angle.x & 0xFF;
}
/* 8003A20C-8003A218 034B4C 000C+00 0/0 0/0 2/2 .text getEventNo2__13door_param2_cFP10fopAc_ac_c
*/
u32 door_param2_c::getEventNo2(fopAc_ac_c* i_actor) {
return (i_actor->orig.angle.x >> 8) & 0xFF;
return (i_actor->home.angle.x >> 8) & 0xFF;
}
/* 8003A218-8003A224 034B58 000C+00 0/0 0/0 2/2 .text getMsgNo__13door_param2_cFP10fopAc_ac_c */
u16 door_param2_c::getMsgNo(fopAc_ac_c* i_actor) {
return i_actor->orig.angle.x;
return i_actor->home.angle.x;
}
/* 8003A224-8003A230 034B64 000C+00 0/0 0/0 6/6 .text getExitNo__13door_param2_cFP10fopAc_ac_c */
src/d/d_insect.cpp
+5 -5
View File
@@ -26,10 +26,10 @@ void dInsect_c::Insect_GetDemoMain() {
switch (m_mode) {
case 0:
if (fopAcM_checkCarryNow(this)) {
cLib_offBit<u32>(mAttentionInfo.mFlags, 0x10);
cLib_offBit<u32>(attention_info.flags, 0x10);
fopAcM_cancelCarryNow(this);
fopAcM_orderItemEvent(this, 0, 0);
mEvtInfo.i_onCondition(dEvtCnd_CANGETITEM_e);
eventInfo.i_onCondition(dEvtCnd_CANGETITEM_e);
m_itemId = fopAcM_createItemForTrBoxDemo(&current.pos, m_itemNo, -1,
fopAcM_GetRoomNo(this), NULL, NULL);
@@ -39,11 +39,11 @@ void dInsect_c::Insect_GetDemoMain() {
field_0x585 = 1;
}
} else {
cLib_onBit<u32>(mAttentionInfo.mFlags, 0x10);
cLib_onBit<u32>(attention_info.flags, 0x10);
}
break;
case 1:
if (mEvtInfo.checkCommandItem()) {
if (eventInfo.checkCommandItem()) {
if (m_itemId != fpcM_ERROR_PROCESS_ID_e) {
dComIfGp_event_setItemPartnerId(m_itemId);
}
@@ -52,7 +52,7 @@ void dInsect_c::Insect_GetDemoMain() {
m_mode = 2;
} else {
fopAcM_orderItemEvent(this, 0, 0);
mEvtInfo.i_onCondition(dEvtCnd_CANGETITEM_e);
eventInfo.i_onCondition(dEvtCnd_CANGETITEM_e);
}
break;
case 2:
src/d/event/d_event.cpp
+25 -25
View File
@@ -329,7 +329,7 @@ void dEvt_control_c::setParam(dEvt_order_c* p_order) {
s32 dEvt_control_c::beforeFlagProc(dEvt_order_c* p_order) {
fopAc_ac_c* actor = p_order->mActor2;
if (p_order->mFlag & 4 && actor->mEvtInfo.chkCondition(dEvtCnd_CANTALK_e) != true) {
if (p_order->mFlag & 4 && actor->eventInfo.chkCondition(dEvtCnd_CANTALK_e) != true) {
return 0;
}
@@ -357,10 +357,10 @@ int dEvt_control_c::commonCheck(dEvt_order_c* p_order, u16 condition, u16 comman
fopAc_ac_c* actor1 = p_order->mActor1;
fopAc_ac_c* actor2 = p_order->mActor2;
if ((actor1 != NULL && actor1->mEvtInfo.chkCondition(condition)) &&
(actor2 != NULL && actor2->mEvtInfo.chkCondition(condition))) {
actor1->mEvtInfo.setCommand(command);
actor2->mEvtInfo.setCommand(command);
if ((actor1 != NULL && actor1->eventInfo.chkCondition(condition)) &&
(actor2 != NULL && actor2->eventInfo.chkCondition(condition))) {
actor1->eventInfo.setCommand(command);
actor2->eventInfo.setCommand(command);
setParam(p_order);
return 1;
}
@@ -395,8 +395,8 @@ int dEvt_control_c::talkCheck(dEvt_order_c* p_order) {
if (commonCheck(p_order, 1, 1)) {
mMode = EVT_MODE_TALK;
if (mSpecifiedEvent == -1) {
if (actor != NULL && actor->mEvtInfo.getEventName() != NULL) {
mSpecifiedEvent = actor->mEvtInfo.getEventId();
if (actor != NULL && actor->eventInfo.getEventName() != NULL) {
mSpecifiedEvent = actor->eventInfo.getEventId();
} else {
mSpecifiedEvent = i_dComIfGp_getEventManager().getEventIdx(event, 0xFF, -1);
}
@@ -443,7 +443,7 @@ int dEvt_control_c::talkXyCheck(dEvt_order_c* p_order) {
return 0;
}
if (pActor2 == NULL || !pActor2->mEvtInfo.chkCondition(dEvtCnd_CANTALKITEM_e)) {
if (pActor2 == NULL || !pActor2->eventInfo.chkCondition(dEvtCnd_CANTALKITEM_e)) {
return 0;
}
@@ -464,13 +464,13 @@ int dEvt_control_c::catchCheck(dEvt_order_c* p_order) {
fopAc_ac_c* actor2 = p_order->mActor2;
fopAc_ac_c* actor1 = p_order->mActor1;
if (actor1 == NULL || (actor2 != NULL && !actor2->mEvtInfo.chkCondition(0x40))) {
if (actor1 == NULL || (actor2 != NULL && !actor2->eventInfo.chkCondition(0x40))) {
return 0;
}
actor1->mEvtInfo.setCommand(dEvtCmd_INCATCH_e);
actor1->eventInfo.setCommand(dEvtCmd_INCATCH_e);
if (actor2 != NULL) {
actor2->mEvtInfo.setCommand(dEvtCmd_INCATCH_e);
actor2->eventInfo.setCommand(dEvtCmd_INCATCH_e);
}
setParam(p_order);
@@ -487,12 +487,12 @@ int dEvt_control_c::catchCheck(dEvt_order_c* p_order) {
int dEvt_control_c::talkEnd() {
fopAc_ac_c* actor = getPt1();
if (actor != NULL) {
actor->mEvtInfo.setCommand(dEvtCmd_NONE_e);
actor->eventInfo.setCommand(dEvtCmd_NONE_e);
}
actor = getPt2();
if (actor != NULL) {
actor->mEvtInfo.setCommand(dEvtCmd_NONE_e);
actor->eventInfo.setCommand(dEvtCmd_NONE_e);
}
if (mSpecifiedEvent != -1) {
@@ -519,11 +519,11 @@ int dEvt_control_c::demoCheck(dEvt_order_c* p_order) {
}
if (!(p_order->mFlag & 0x10)) {
if (actor1 != NULL && !actor1->mEvtInfo.chkCondition(2)) {
if (actor1 != NULL && !actor1->eventInfo.chkCondition(2)) {
return 0;
}
if (actor2 != NULL && !actor2->mEvtInfo.chkCondition(2)) {
if (actor2 != NULL && !actor2->eventInfo.chkCondition(2)) {
return 0;
}
}
@@ -533,7 +533,7 @@ int dEvt_control_c::demoCheck(dEvt_order_c* p_order) {
}
if (actor1 != NULL) {
i_dComIfGp_getEventManager().setObjectArchive(actor1->mEvtInfo.getArchiveName());
i_dComIfGp_getEventManager().setObjectArchive(actor1->eventInfo.getArchiveName());
}
if (!i_dComIfGp_getEventManager().order(eventId)) {
@@ -541,11 +541,11 @@ int dEvt_control_c::demoCheck(dEvt_order_c* p_order) {
}
if (actor1 != NULL) {
actor1->mEvtInfo.setCommand(dEvtCmd_INDEMO_e);
actor1->eventInfo.setCommand(dEvtCmd_INDEMO_e);
}
if (actor2 != NULL) {
actor2->mEvtInfo.setCommand(dEvtCmd_INDEMO_e);
actor2->eventInfo.setCommand(dEvtCmd_INDEMO_e);
}
mMode = EVT_MODE_DEMO;
@@ -558,12 +558,12 @@ int dEvt_control_c::demoCheck(dEvt_order_c* p_order) {
int dEvt_control_c::demoEnd() {
fopAc_ac_c* actor = getPt1();
if (actor != NULL) {
actor->mEvtInfo.setCommand(dEvtCmd_NONE_e);
actor->eventInfo.setCommand(dEvtCmd_NONE_e);
}
actor = getPt2();
if (actor != NULL) {
actor->mEvtInfo.setCommand(dEvtCmd_NONE_e);
actor->eventInfo.setCommand(dEvtCmd_NONE_e);
}
if (mSpecifiedEvent != -1) {
@@ -579,7 +579,7 @@ int dEvt_control_c::potentialCheck(dEvt_order_c* p_order) {
if (!beforeFlagProc(p_order)) {
return 0;
} else {
actor->mEvtInfo.setCommand(dEvtCmd_INDEMO_e);
actor->eventInfo.setCommand(dEvtCmd_INDEMO_e);
mMode = EVT_MODE_DEMO;
setParam(p_order);
afterFlagProc(p_order);
@@ -595,11 +595,11 @@ int dEvt_control_c::doorCheck(dEvt_order_c* p_order) {
fopAc_ac_c* actor2 = getPt2();
if (actor2 != NULL) {
i_dComIfGp_getEventManager().setObjectArchive(actor2->mEvtInfo.getArchiveName());
i_dComIfGp_getEventManager().setObjectArchive(actor2->eventInfo.getArchiveName());
}
if (mSpecifiedEvent == -1 && actor2 != NULL && actor2->mEvtInfo.getEventId() != -1) {
mSpecifiedEvent = actor2->mEvtInfo.getEventId();
if (mSpecifiedEvent == -1 && actor2 != NULL && actor2->eventInfo.getEventId() != -1) {
mSpecifiedEvent = actor2->eventInfo.getEventId();
}
if (mSpecifiedEvent != -1 &&
@@ -1134,7 +1134,7 @@ int dEvt_control_c::moveApproval(void* param_0) {
return 2;
}
if (actor->mDemoActorId != 0) {
if (actor->demoActorID != 0) {
return 2;
}
break;
src/d/event/d_event_data.cpp
+2 -1
View File
@@ -686,7 +686,8 @@ void dEvDtStaff_c::specialProcCreate() {
cXyz* posP = dComIfGp_evmng_getMyXyzP(staffId, "POS");
if (posP == NULL) {
pos = dComIfGp_getPlayer(0)->getPosition();
fopAc_ac_c* player_p = dComIfGp_getPlayer(0);
pos = player_p->current.pos;
} else {
pos = *posP;
}
src/d/event/d_event_lib.cpp
+10 -10
View File
@@ -36,11 +36,11 @@ BOOL dEvLib_callback_c::setEvent(int mapToolId, int eventIdx, int param_2) {
if (mAction != NULL) {
return FALSE;
} else {
mActor->mEvtInfo.setMapToolId(mapToolId);
mActor->eventInfo.setMapToolId(mapToolId);
if (mapToolId != 0xFF && eventIdx == 0xFF) {
eventIdx = i_dComIfGp_getEventManager().getEventIdx(mActor, mapToolId);
}
mActor->mEvtInfo.setEventId(eventIdx);
mActor->eventInfo.setEventId(eventIdx);
_C = param_2;
return setAction(&l_startAction);
}
@@ -89,15 +89,15 @@ BOOL dEvLib_callback_c::initStart() {
/* 80048A70-80048B1C 0433B0 00AC+00 2/1 0/0 0/0 .text executeStart__17dEvLib_callback_cFv
*/
BOOL dEvLib_callback_c::executeStart() {
if (!mActor->mEvtInfo.checkCommandDemoAccrpt()) {
if (mActor->mEvtInfo.getMapToolId() != 0xFF) {
fopAcM_orderMapToolEvent(mActor, mActor->mEvtInfo.getMapToolId(),
mActor->mEvtInfo.getEventId(), 0xFFFF, _C, 0);
if (!mActor->eventInfo.checkCommandDemoAccrpt()) {
if (mActor->eventInfo.getMapToolId() != 0xFF) {
fopAcM_orderMapToolEvent(mActor, mActor->eventInfo.getMapToolId(),
mActor->eventInfo.getEventId(), 0xFFFF, _C, 0);
} else {
fopAcM_orderOtherEventId(mActor, mActor->mEvtInfo.getEventId(),
mActor->mEvtInfo.getMapToolId(), 0xFFFF, 0, _C);
fopAcM_orderOtherEventId(mActor, mActor->eventInfo.getEventId(),
mActor->eventInfo.getMapToolId(), 0xFFFF, 0, _C);
}
mActor->mEvtInfo.i_onCondition(2);
mActor->eventInfo.i_onCondition(2);
return TRUE;
} else {
return setAction(&l_runAction);
@@ -112,7 +112,7 @@ BOOL dEvLib_callback_c::initRun() {
/* 80048B48-80048BD8 043488 0090+00 1/0 0/0 0/0 .text executeRun__17dEvLib_callback_cFv
*/
BOOL dEvLib_callback_c::executeRun() {
if (!i_dComIfGp_getEventManager().endCheck(mActor->mEvtInfo.getEventId())) {
if (!i_dComIfGp_getEventManager().endCheck(mActor->eventInfo.getEventId())) {
return eventRun();
} else {
i_dComIfGp_getEvent().reset();
src/d/event/d_event_manager.cpp
+11 -11
View File
@@ -379,7 +379,7 @@ void dEvent_manager_c::Sequencer() {
int cutType = dStage_MapEvent_dt_c_getEventSCutType(mapEvent);
if (iVar5 && cutType != 1) {
bVar1 = true;
cXyz attentionPos(dComIfGp_getPlayer(0)->mAttentionInfo.mPosition);
cXyz attentionPos(dComIfGp_getPlayer(0)->attention_info.position);
cXyz camCenter = dCam_getBody()->Center();
f32 distance = cXyz((attentionPos - camCenter)).abs();
@@ -553,7 +553,7 @@ s16 dEvent_manager_c::getEventIdx(char const* eventName, u8 mapToolID, s32 roomN
/* 80047698-80047758 041FD8 00C0+00 0/0 3/3 25/25 .text
* getEventIdx__16dEvent_manager_cFP10fopAc_ac_cUc */
s16 dEvent_manager_c::getEventIdx(fopAc_ac_c* pActor, u8 mapToolID) {
dStage_MapEvent_dt_c* data = dEvt_control_c::searchMapEventData(mapToolID, pActor->getRoomNo());
dStage_MapEvent_dt_c* data = dEvt_control_c::searchMapEventData(mapToolID, fopAcM_GetRoomNo(pActor));
if (data != NULL) {
switch (data->mType) {
case 1:
@@ -571,7 +571,7 @@ s16 dEvent_manager_c::getEventIdx(fopAc_ac_c* pActor, u8 mapToolID) {
/* 80047758-80047930 042098 01D8+00 1/1 10/10 92/92 .text
* getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc */
s16 dEvent_manager_c::getEventIdx(fopAc_ac_c* pActor, char const* eventName, u8 mapToolID) {
s8 actorRoomNo = pActor->getRoomNo();
s8 actorRoomNo = fopAcM_GetRoomNo(pActor);
if (mapToolID != 0xFF) {
dStage_MapEvent_dt_c* data = dEvt_control_c::searchMapEventData(mapToolID, actorRoomNo);
@@ -599,9 +599,9 @@ s16 dEvent_manager_c::getEventIdx(fopAc_ac_c* pActor, char const* eventName, u8
dEvDtBase_c* eventP = &mEventList[type];
dEvDtBase_c event;
if (type < 4 || 9 < type || actorRoomNo == mEventList[type].roomNo()) {
if (pActor != NULL && type == 2 && pActor->mEvtInfo.getArchiveName() != NULL) {
if (pActor != NULL && type == 2 && pActor->eventInfo.getArchiveName() != NULL) {
event.init(
(char*)dComIfG_getObjectRes(pActor->mEvtInfo.getArchiveName(), DataFileName),
(char*)dComIfG_getObjectRes(pActor->eventInfo.getArchiveName(), DataFileName),
-1);
eventP = &event;
}
@@ -693,7 +693,7 @@ int dEvent_manager_c::getMyStaffId(char const* staffName, fopAc_ac_c* pActor, in
return -1;
} else {
if (pActor != NULL) {
evtIdx = pActor->mEvtInfo.getIdx();
evtIdx = pActor->eventInfo.getIdx();
}
if (mCurrentEventCompositId == -1) {
return -1;
@@ -920,9 +920,9 @@ int dEvent_manager_c::getEventPrio(fopAc_ac_c* pActor, s16 eventCompositId) {
dEvDtEvent_c* event = NULL;
dEvDtBase_c eventBase;
if (getTypeCompositId(eventCompositId) == 2 && pActor != NULL &&
pActor->mEvtInfo.getArchiveName() != NULL)
pActor->eventInfo.getArchiveName() != NULL)
{
char* data = (char*)dComIfG_getObjectRes(pActor->mEvtInfo.getArchiveName(), DataFileName);
char* data = (char*)dComIfG_getObjectRes(pActor->eventInfo.getArchiveName(), DataFileName);
eventBase.init(data, -1);
event = eventBase.mEventP;
}
@@ -1002,7 +1002,7 @@ static fopAc_ac_c* findShutterCallBack(fopAc_ac_c* pActor, void* param_1) {
return NULL;
}
cXyz diff = pActor->orig.pos - prms->mActor->orig.pos;
cXyz diff = pActor->home.pos - prms->mActor->home.pos;
if (diff.x < 10 && diff.x > -10 && diff.y < 10 && diff.y > -10 && diff.z < 10 && diff.z > -10) {
return pActor;
}
@@ -1019,8 +1019,8 @@ fopAc_ac_c* dEvent_manager_c::specialCast_Shutter(s16 bsTypeId, int param_1) {
(fopAc_ac_c*)fopAcIt_Judge((fopAcIt_JudgeFunc)findShutterCallBack, &prms);
if (shutterActor != NULL && param_1 != 0) {
cXyz goal(shutterActor->orig.pos);
s16 angle = prms.mActor->orig.angle.y + 0x8000;
cXyz goal(shutterActor->home.pos);
s16 angle = prms.mActor->home.angle.y + 0x8000;
goal.x += cM_ssin(angle) * 100;
goal.z += cM_scos(angle) * 100;
setGoal(&goal);
src/d/kankyo/d_kankyo.cpp
+1 -1
View File
@@ -2393,7 +2393,7 @@ void dScnKy_env_light_c::setDaytime() {
fopAc_ac_c* ac = dMsgObject_c::getActor();
bool tmp = true;
if (ac != NULL && ac->mEvtInfo.mCommand >= 2) {
if (ac != NULL && ac->eventInfo.mCommand >= 2) {
tmp = false;
}
src/d/map/d_map_path.cpp
+4 -101
View File
@@ -1,7 +1,7 @@
//
// Generated By: dol2asm
// Translation Unit: d/map/d_map_path
//
/**
* d_map_path.cpp
*
*/
#include "d/map/d_map_path.h"
#include "JSystem/J2DGraph/J2DGrafContext.h"
@@ -9,50 +9,6 @@
#include "d/com/d_com_inf_game.h"
#include "m_Do/m_Do_lib.h"
//
// Forward References:
//
extern "C" void create__Q28dMpath_n18dTexObjAggregate_cFv();
extern "C" void remove__Q28dMpath_n18dTexObjAggregate_cFv();
extern "C" void rendering__11dDrawPath_cFPCQ211dDrawPath_c10line_class();
extern "C" void rendering__11dDrawPath_cFPCQ211dDrawPath_c10poly_class();
extern "C" void rendering__11dDrawPath_cFPCQ211dDrawPath_c11group_class();
extern "C" void rendering__11dDrawPath_cFPCQ211dDrawPath_c11floor_class();
extern "C" void rendering__11dDrawPath_cFPCQ211dDrawPath_c10room_class();
extern "C" void drawPath__11dDrawPath_cFv();
extern "C" void makeResTIMG__15dRenderingMap_cCFP7ResTIMGUsUsPUcPUcUs();
extern "C" void renderingMap__15dRenderingMap_cFv();
extern "C" void setTevSettingNonTextureDirectColor__18dRenderingFDAmap_cCFv();
extern "C" void setTevSettingIntensityTextureToCI__18dRenderingFDAmap_cCFv();
extern "C" void drawBack__18dRenderingFDAmap_cCFv();
extern "C" void preRenderingMap__18dRenderingFDAmap_cFv();
extern "C" void postRenderingMap__18dRenderingFDAmap_cFv();
extern "C" void renderingDecoration__18dRenderingFDAmap_cFPCQ211dDrawPath_c10line_class();
extern "C" void getDecoLineColor__18dRenderingFDAmap_cFii();
extern "C" void getDecorationLineWidth__18dRenderingFDAmap_cFi();
extern "C" void __sinit_d_map_path_cpp();
extern "C" void __dt__Q28dMpath_n18dTexObjAggregate_cFv();
extern "C" extern char const* const d_map_d_map_path__stringBase0;
extern "C" extern void* __vt__18dRenderingFDAmap_c[26];
extern "C" extern void* __vt__11dDrawPath_c[16];
extern "C" u8 m_texObjAgg__8dMpath_n[28];
//
// External References:
//
extern "C" void draw__12dDlst_base_cFv();
extern "C" bool isDrawType__11dDrawPath_cFi();
extern "C" void __dt__18dRenderingFDAmap_cFv();
extern "C" void __dt__11dDrawPath_cFv();
extern "C" void getLineColor__11dDrawPath_cFii();
extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci();
//
// Declarations:
//
/* 8003C85C-8003C8F4 03719C 0098+00 0/0 1/1 0/0 .text create__Q28dMpath_n18dTexObjAggregate_cFv */
void dMpath_n::dTexObjAggregate_c::create() {
static int const data[7] = {
@@ -382,56 +338,3 @@ const GXColor* dRenderingFDAmap_c::getDecoLineColor(int param_0, int param_1) {
s32 dRenderingFDAmap_c::getDecorationLineWidth(int param_0) {
return getLineWidth(param_0);
}
/* ############################################################################################## */
/* 803A7C90-803A7CF8 004DB0 0068+00 0/0 12/12 0/0 .data __vt__18dRenderingFDAmap_c */
extern void* __vt__18dRenderingFDAmap_c[26] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)draw__12dDlst_base_cFv,
(void*)__dt__18dRenderingFDAmap_cFv,
(void*)isDrawType__11dDrawPath_cFi,
(void*)NULL,
(void*)getLineColor__11dDrawPath_cFii,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)drawPath__11dDrawPath_cFv,
(void*)rendering__11dDrawPath_cFPCQ211dDrawPath_c10line_class,
(void*)rendering__11dDrawPath_cFPCQ211dDrawPath_c10poly_class,
(void*)rendering__11dDrawPath_cFPCQ211dDrawPath_c10room_class,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)preRenderingMap__18dRenderingFDAmap_cFv,
(void*)postRenderingMap__18dRenderingFDAmap_cFv,
(void*)NULL,
(void*)getDecoLineColor__18dRenderingFDAmap_cFii,
(void*)getDecorationLineWidth__18dRenderingFDAmap_cFi,
};
/* 803A7CF8-803A7D38 004E18 0040+00 0/0 15/15 0/0 .data __vt__11dDrawPath_c */
extern void* __vt__11dDrawPath_c[16] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)draw__12dDlst_base_cFv,
(void*)__dt__11dDrawPath_cFv,
(void*)isDrawType__11dDrawPath_cFi,
(void*)NULL,
(void*)getLineColor__11dDrawPath_cFii,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)drawPath__11dDrawPath_cFv,
(void*)rendering__11dDrawPath_cFPCQ211dDrawPath_c10line_class,
(void*)rendering__11dDrawPath_cFPCQ211dDrawPath_c10poly_class,
(void*)rendering__11dDrawPath_cFPCQ211dDrawPath_c10room_class,
};
/* 80379C4C-80379C4C 0062AC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/msg/d_msg_class.cpp
+1 -1
View File
@@ -847,7 +847,7 @@ void jmessage_tReference::calcDistance() {
mDistanceScale = 1.0f;
} else {
fopAc_ac_c* player = dComIfGp_getPlayer(0);
(mActorPos - player->mAttentionInfo.mPosition).absXZ();
(mActorPos - player->attention_info.position).absXZ();
mDistanceScale = 1.0f;
}
}
src/d/msg/d_msg_flow.cpp
+4 -4
View File
@@ -1213,10 +1213,10 @@ int dMsgFlow_c::query006(mesg_flow_node_branch* flow_node, fopAc_ac_c* param_1,
#ifdef NONMATCHING
int dMsgFlow_c::query007(mesg_flow_node_branch* flow_node, fopAc_ac_c* param_1, int param_2) {
u32 uVar3 = *(u16*)(flow_node->params);
cXyz this_00 = daPy_getPlayerActorClass()->mAttentionInfo.mPosition;
cXyz this_00 = daPy_getPlayerActorClass()->attention_info.position;
this_00.y -= daPy_getPlayerActorClass()->getAttentionOffsetY();
s16 uVar8 = (cSGlobe(param_1->mAttentionInfo.mPosition - this_00).U() - daPy_getPlayerActorClass()->shape_angle.GetY());
u8 attentionId = param_1->mAttentionInfo.field_0x0[3];
s16 uVar8 = (cSGlobe(param_1->attention_info.position - this_00).U() - daPy_getPlayerActorClass()->shape_angle.GetY());
u8 attentionId = param_1->attention_info.field_0x0[3];
f32 fVar1 = dAttention_c::getDistTable(attentionId).field_0x4;
u16 x = uVar3;
if (x != 0) {
@@ -1224,7 +1224,7 @@ int dMsgFlow_c::query007(mesg_flow_node_branch* flow_node, fopAc_ac_c* param_1,
}
return (u16) dComIfGp_getAttention().checkDistance(
&this_00, uVar8, &param_1->mAttentionInfo.mPosition, fVar1,
&this_00, uVar8, &param_1->attention_info.position, fVar1,
dAttention_c::getDistTable(attentionId).field_0x8,
dAttention_c::getDistTable(attentionId).field_0xc,
dAttention_c::getDistTable(attentionId).field_0x10);
src/d/s/d_s_menu.cpp
+2 -2
View File
@@ -14,10 +14,10 @@ extern scene_process_profile_definition g_profile_MENU_SCENE = {
1, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_MENU_SCENE, // mProcName
&g_fpcNd_Method.mBase, // mSubMtd
&g_fpcNd_Method.mBase, // sub_method
0, // mSize
0, // mSizeOther
0, // mParameters
&g_fopScn_Method.mBase, // mSubMtd
&g_fopScn_Method.mBase, // sub_method
NULL, // mpMtd
};
src/d/s/d_s_play.cpp
+4 -4
View File
@@ -760,11 +760,11 @@ scene_process_profile_definition g_profile_PLAY_SCENE = {
1, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_PLAY_SCENE, // mProcName
&g_fpcNd_Method.mBase, // mSubMtd
&g_fpcNd_Method.mBase, // sub_method
sizeof(dScnPly_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopScn_Method.mBase, // mSubMtd
&g_fopScn_Method.mBase, // sub_method
(process_method_class*)&l_dScnPly_Method, // mpMtd
};
@@ -774,10 +774,10 @@ scene_process_profile_definition g_profile_OPENING_SCENE = {
1, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_OPENING_SCENE, // mProcName
&g_fpcNd_Method.mBase, // mSubMtd
&g_fpcNd_Method.mBase, // sub_method
sizeof(dScnPly_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopScn_Method.mBase, // mSubMtd
&g_fopScn_Method.mBase, // sub_method
(process_method_class*)&l_dScnPly_Method, // mpMtd
};
src/d/s/d_s_room.cpp
+2 -2
View File
@@ -441,10 +441,10 @@ scene_process_profile_definition g_profile_ROOM_SCENE = {
0, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_ROOM_SCENE, // mProcName
&g_fpcNd_Method.mBase, // mSubMtd
&g_fpcNd_Method.mBase, // sub_method
sizeof(room_of_scene_class), // mSize
0, // mSizeOther
0, // mParameters
&g_fopScn_Method.mBase, // mSubMtd
&g_fopScn_Method.mBase, // sub_method
(process_method_class*)&l_dScnRoom_Method, // mpMtd
};
src/d/s/d_s_title.cpp
+4 -4
View File
@@ -14,11 +14,11 @@ extern scene_process_profile_definition g_profile_WARNING_SCENE = {
1, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_WARNING_SCENE, // mProcName
&g_fpcNd_Method.mBase, // mSubMtd
&g_fpcNd_Method.mBase, // sub_method
0x204, // mSize
0, // mSizeOther
0, // mParameters
&g_fopScn_Method.mBase, // mSubMtd
&g_fopScn_Method.mBase, // sub_method
NULL, // mpMtd
};
@@ -28,10 +28,10 @@ extern scene_process_profile_definition g_profile_WARNING2_SCENE = {
1, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_WARNING2_SCENE, // mProcName
&g_fpcNd_Method.mBase, // mSubMtd
&g_fpcNd_Method.mBase, // sub_method
0x204, // mSize
0, // mSizeOther
0, // mParameters
&g_fopScn_Method.mBase, // mSubMtd
&g_fopScn_Method.mBase, // sub_method
NULL, // mpMtd
};
src/d/shop/d_shop_camera.cpp
+8 -8
View File
@@ -187,7 +187,7 @@ void ShopCam_action_c::setCamDataIdx(fopAc_ac_c* param_1, fopAc_ac_c* param_2, f
fopAc_ac_c* param_4, cXyz* param_5, cXyz* param_6) {
field_0xd6 = -1;
if (field_0x18 == NULL) {
field_0xb0 = param_1->mEyePos;
field_0xb0 = param_1->eyePos;
}
field_0x18 = param_1;
@@ -222,7 +222,7 @@ void ShopCam_action_c::setCamDataIdx2(fopAc_ac_c* param_1, fopAc_ac_c* param_2,
fopAc_ac_c* param_7, cXyz* param_8, cXyz* param_9) {
field_0xd6 = -1;
if (field_0x18 == NULL) {
field_0xb0 = param_1->mEyePos;
field_0xb0 = param_1->eyePos;
}
field_0x18 = param_1;
@@ -264,17 +264,17 @@ void ShopCam_action_c::_debugSetCamera() {
if (field_0x1c != NULL && field_0x20 != NULL && field_0x24 != NULL && field_0x28 != NULL &&
field_0x2c == NULL && field_0x30 == NULL)
{
local_4c.x = (field_0x24->orig.pos.x + field_0x20->orig.pos.x) / 2;
local_4c.y = (field_0x24->orig.pos.y + field_0x20->orig.pos.y) / 2;
local_4c.z = (field_0x24->orig.pos.z + field_0x20->orig.pos.z) / 2;
local_4c.x = (field_0x24->home.pos.x + field_0x20->home.pos.x) / 2;
local_4c.y = (field_0x24->home.pos.y + field_0x20->home.pos.y) / 2;
local_4c.z = (field_0x24->home.pos.z + field_0x20->home.pos.z) / 2;
} else {
if (field_0x1c != NULL && field_0x20 != NULL && field_0x24 != NULL && field_0x28 != NULL &&
field_0x2c != NULL && field_0x30 == NULL)
{
local_4c.set(field_0x28->orig.pos);
local_4c.set(field_0x28->home.pos);
bVar1 = true;
} else {
local_4c.set(field_0x20->orig.pos);
local_4c.set(field_0x20->home.pos);
}
}
@@ -297,7 +297,7 @@ void ShopCam_action_c::_debugSetCamera() {
* setMasterCamCtrPos__16ShopCam_action_cFP4cXyz */
void ShopCam_action_c::setMasterCamCtrPos(cXyz* param_0) {
if (param_0 == NULL) {
field_0xb0.set(field_0x18->mEyePos);
field_0xb0.set(field_0x18->eyePos);
} else {
field_0xb0.set(*param_0);
}
src/d/shop/d_shop_item_ctrl.cpp
+5 -5
View File
@@ -39,7 +39,7 @@ bool dShopItemCtrl_c::isHomePos(int i_itemIdx) {
daShopItem_c* item = (daShopItem_c*)fopAcM_SearchByID(mItemIndex[i_itemIdx]);
if (item != NULL) {
cXyz* item_pos = item->getPosP();
cXyz item_home = item->orig.pos;
cXyz item_home = item->home.pos;
if (item_pos->x == item_home.x && item_pos->y == item_home.y &&
item_pos->z == item_home.z)
@@ -64,7 +64,7 @@ void dShopItemCtrl_c::setRotateAnime(int i_itemIdx) {
if (i == i_itemIdx - 1) {
item_rot->y += 0x200;
} else {
cLib_addCalcAngleS(&item_rot->y, item->orig.angle.y, 4, 0x800, 0x80);
cLib_addCalcAngleS(&item_rot->y, item->home.angle.y, 4, 0x800, 0x80);
}
}
}
@@ -84,7 +84,7 @@ void dShopItemCtrl_c::setZoomAnime(int param_1, cXyz* param_2, s16 param_3, bool
}
cXyz* pos_p = shopItem->getPosP();
cXyz target_pos = shopItem->orig.pos;
cXyz target_pos = shopItem->home.pos;
cXyz cStack_50 = *param_2 - target_pos;
s16 x_angle = shopItem->getAngleX();
s16 y_angle = shopItem->getAngleY();
@@ -93,13 +93,13 @@ void dShopItemCtrl_c::setZoomAnime(int param_1, cXyz* param_2, s16 param_3, bool
cLib_addCalcPos2(pos_p, *param_2, 0.5f, 0.05f * cStack_50.abs());
cLib_addCalcAngleS(&x_angle, param_3, 4, 0x800, 0x80);
shopItem->setAngleX(x_angle);
cLib_addCalcAngleS(&y_angle, shopItem->orig.angle.y, 4, 0x800, 0x80);
cLib_addCalcAngleS(&y_angle, shopItem->home.angle.y, 4, 0x800, 0x80);
shopItem->setAngleY(y_angle);
} else {
cLib_addCalcPos2(pos_p, target_pos, 0.5f, 0.1f * cStack_50.abs());
cXyz cStack_5c = *pos_p - target_pos;
if (cStack_5c.abs() < 0.01f) {
pos_p->set(shopItem->orig.pos);
pos_p->set(shopItem->home.pos);
}
cLib_addCalcAngleS(&x_angle, 0, 4, 0x800, 0x80);
src/d/shop/d_shop_system.cpp
+20 -20
View File
@@ -57,8 +57,8 @@ static int dShopSystem_searchItemActor(void* i_actor, void* param_1) {
dShopSystem_itemActor[4] != i_actor && dShopSystem_itemActor[5] != i_actor &&
dShopSystem_itemActor[6] != i_actor)
{
u8 sw = static_cast<fopAc_ac_c*>(i_actor)->orig.angle.z;
u8 sw2 = ((u16) static_cast<fopAc_ac_c*>(i_actor)->orig.angle.z) >> 8;
u8 sw = static_cast<fopAc_ac_c*>(i_actor)->home.angle.z;
u8 sw2 = ((u16) static_cast<fopAc_ac_c*>(i_actor)->home.angle.z) >> 8;
u8 item_no = fopAcM_GetParam(i_actor) & 0xFF;
if ((sw == 0xFF || !dComIfGs_isSaveSwitch(sw)) &&
@@ -772,32 +772,32 @@ int dShopSystem_c::itemZoom(cXyz* param_0) {
if (dShopSystem_itemActor[1] != NULL && dShopSystem_cameraActor[1] != NULL) {
cXyz local_40;
local_40.set(dShopSystem_itemActor[1]->orig.pos);
local_40.set(dShopSystem_itemActor[1]->home.pos);
f32 tmp_05 = 0.5f;
if (dShopSystem_sellItemMax == 4) {
if (dShopSystem_itemActor[2] != NULL) {
f32 tmp = (dShopSystem_itemActor[2]->orig.pos.x +
dShopSystem_itemActor[1]->orig.pos.x);
f32 tmp = (dShopSystem_itemActor[2]->home.pos.x +
dShopSystem_itemActor[1]->home.pos.x);
local_40.x = tmp * tmp_05;
f32 tmp2 = (dShopSystem_itemActor[2]->orig.pos.y +
dShopSystem_itemActor[1]->orig.pos.y);
f32 tmp2 = (dShopSystem_itemActor[2]->home.pos.y +
dShopSystem_itemActor[1]->home.pos.y);
local_40.y = tmp2 * tmp_05;
f32 tmp3 = (dShopSystem_itemActor[2]->orig.pos.z +
dShopSystem_itemActor[1]->orig.pos.z);
f32 tmp3 = (dShopSystem_itemActor[2]->home.pos.z +
dShopSystem_itemActor[1]->home.pos.z);
local_40.z = tmp3 * tmp_05;
}
} else if (dShopSystem_sellItemMax == 5) {
f32 tmp =
(dShopSystem_itemActor[2]->orig.pos.x + dShopSystem_itemActor[3]->orig.pos.x);
(dShopSystem_itemActor[2]->home.pos.x + dShopSystem_itemActor[3]->home.pos.x);
local_40.x = tmp * tmp_05;
local_40.y = dShopSystem_itemActor[0]->orig.pos.y;
local_40.y = dShopSystem_itemActor[0]->home.pos.y;
f32 tmp3 =
(dShopSystem_itemActor[2]->orig.pos.z + dShopSystem_itemActor[3]->orig.pos.z);
(dShopSystem_itemActor[2]->home.pos.z + dShopSystem_itemActor[3]->home.pos.z);
local_40.z = tmp3 * tmp_05;
}
@@ -1405,7 +1405,7 @@ void dShopSystem_c::setSoldOutFlag() {
void dShopSystem_c::setSoldOut() {
if (mSoldOutFlag != 0xFF) {
if (field_0xf60 < 0) {
u8 sw = (u8)dShopSystem_itemActor[mSoldOutFlag]->orig.angle.z & 0xFF;
u8 sw = (u8)dShopSystem_itemActor[mSoldOutFlag]->home.angle.z & 0xFF;
if (sw != 0xFF && !dComIfGs_isSaveSwitch(sw)) {
dComIfGs_onSaveSwitch(sw);
}
@@ -1532,8 +1532,8 @@ int dShopSystem_c::searchItemActor() {
for (int i = 0; i < dShopSystem_sellItemMax; i++) {
u32 processId = dShopSystem_itemActor[i]->getProcessID();
mItemCtrl.setItemIndex(i, processId);
mItemCtrl.setMessageIndex(i, (u16)dShopSystem_itemActor[i]->orig.angle.x != 0xFFFF ?
(u16)dShopSystem_itemActor[i]->orig.angle.x :
mItemCtrl.setMessageIndex(i, (u16)dShopSystem_itemActor[i]->home.angle.x != 0xFFFF ?
(u16)dShopSystem_itemActor[i]->home.angle.x :
-1);
if (processId + 0x10000 == 0xFFFF) {
@@ -1569,8 +1569,8 @@ int dShopSystem_c::searchItemActor() {
for (int i = 0; i < 7; i++) {
if (dShopSystem_itemActor[i] != NULL) {
u8 sw0 = dShopSystem_itemActor[i]->orig.angle.z;
u8 sw1 = ((u16)dShopSystem_itemActor[i]->orig.angle.z) >> 8;
u8 sw0 = dShopSystem_itemActor[i]->home.angle.z;
u8 sw1 = ((u16)dShopSystem_itemActor[i]->home.angle.z) >> 8;
if ((sw0 != 0xFF && !dComIfGs_isSaveSwitch(sw0)) &&
(sw1 != 0xFF && !dComIfGs_isSaveSwitch(sw1)))
@@ -1589,8 +1589,8 @@ int dShopSystem_c::searchItemActor() {
for (int i = 0; i < 7; i++) {
if (dShopSystem_itemActor[i] != NULL) {
u8 sw0 = dShopSystem_itemActor[i]->orig.angle.z;
u8 sw1 = ((u16)dShopSystem_itemActor[i]->orig.angle.z) >> 8;
u8 sw0 = dShopSystem_itemActor[i]->home.angle.z;
u8 sw1 = ((u16)dShopSystem_itemActor[i]->home.angle.z) >> 8;
if ((sw0 != 0xFF && !dComIfGs_isSaveSwitch(sw0)) &&
(sw1 != 0xFF && !dComIfGs_isSaveSwitch(sw1)))
@@ -1611,7 +1611,7 @@ int dShopSystem_c::searchItemActor() {
/* 8019AB00-8019AB1C 195440 001C+00 1/1 0/0 0/0 .text getFlowNodeNum__13dShopSystem_cFv
*/
int dShopSystem_c::getFlowNodeNum() {
u16 num = orig.angle.x;
u16 num = home.angle.x;
if (num == 0xFFFF) {
return -1;
}
src/f_op/f_op_actor.cpp
+50 -50
View File
@@ -26,7 +26,7 @@ static int g_fopAc_type;
/* 80018CE0-80018D0C 013620 002C+00 0/0 12/12 391/391 .text fopAc_IsActor__FPv */
s32 fopAc_IsActor(void* i_this) {
return fpcM_IsJustType(g_fopAc_type, ((fopAc_ac_c*)i_this)->mAcType);
return fpcM_IsJustType(g_fopAc_type, ((fopAc_ac_c*)i_this)->actor_type);
}
/* ############################################################################################## */
@@ -45,7 +45,7 @@ static int fopAc_Draw(void* i_this) {
!fopAcM_checkStatus(a_this, 0x21000000))
{
fopAcM_OffCondition(a_this, fopAcCnd_NODRAW_e);
ret = fpcLf_DrawMethod((leafdraw_method_class*)a_this->mSubMtd, a_this);
ret = fpcLf_DrawMethod((leafdraw_method_class*)a_this->sub_method, a_this);
} else {
fopAcM_OnCondition(a_this, fopAcCnd_NODRAW_e);
}
@@ -64,7 +64,7 @@ static int fopAc_Execute(void* i_this) {
if (!dComIfGp_isPauseFlag() && dScnPly_c::isPause()) {
if (!dComIfA_PauseCheck()) {
daSus_c::check(a_this);
a_this->mEvtInfo.beforeProc();
a_this->eventInfo.beforeProc();
s32 move = dComIfGp_event_moveApproval(i_this);
fopAcM_OffStatus(a_this, 0x40000000);
@@ -74,15 +74,15 @@ static int fopAc_Execute(void* i_this) {
(!fopAcM_checkStatus(a_this, fopAcStts_NOEXEC_e) || !fopAcM_CheckCondition(a_this, 4)))))
{
fopAcM_OffCondition(a_this, fopAcCnd_NOEXEC_e);
a_this->next = a_this->current;
ret = fpcMtd_Execute((process_method_class*)a_this->mSubMtd, a_this);
a_this->old = a_this->current;
ret = fpcMtd_Execute((process_method_class*)a_this->sub_method, a_this);
} else {
a_this->mEvtInfo.suspendProc(a_this);
a_this->eventInfo.suspendProc(a_this);
fopAcM_OnCondition(a_this, fopAcCnd_NOEXEC_e);
}
if (fopAcM_checkStatus(a_this, 0x20) &&
a_this->orig.pos.y - a_this->current.pos.y > 5000.0f)
a_this->home.pos.y - a_this->current.pos.y > 5000.0f)
{
fopAcM_delete(a_this);
}
@@ -102,9 +102,9 @@ static int fopAc_Execute(void* i_this) {
static int fopAc_IsDelete(void* i_this) {
fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
int isDelete = fpcMtd_IsDelete((process_method_class*)a_this->mSubMtd, a_this);
int isDelete = fpcMtd_IsDelete((process_method_class*)a_this->sub_method, a_this);
if (isDelete == true) {
fopDwTg_DrawQTo(&a_this->mDwTg);
fopDwTg_DrawQTo(&a_this->draw_tag);
}
return isDelete;
@@ -114,13 +114,13 @@ static int fopAc_IsDelete(void* i_this) {
static int fopAc_Delete(void* i_this) {
fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
int deleted = fpcMtd_Delete((process_method_class*)a_this->mSubMtd, a_this);
int deleted = fpcMtd_Delete((process_method_class*)a_this->sub_method, a_this);
if (deleted == true) {
fopAcTg_ActorQTo(&a_this->mAcTg);
fopDwTg_DrawQTo(&a_this->mDwTg);
fopAcTg_ActorQTo(&a_this->actor_tag);
fopDwTg_DrawQTo(&a_this->draw_tag);
fopAcM_DeleteHeap(a_this);
dDemo_actor_c* demoAc = dDemo_c::getActor(a_this->mDemoActorId);
dDemo_actor_c* demoAc = dDemo_c::getActor(a_this->demoActorID);
if (demoAc != NULL) {
demoAc->setActor(NULL);
}
@@ -136,47 +136,47 @@ static int fopAc_Create(void* i_this) {
if (fpcM_IsFirstCreating(i_this)) {
actor_process_profile_definition* profile =
(actor_process_profile_definition*)fpcM_GetProfile(i_this);
a_this->mAcType = fpcBs_MakeOfType(&g_fopAc_type);
a_this->mSubMtd = (profile_method_class*)profile->mSubMtd;
a_this->actor_type = fpcBs_MakeOfType(&g_fopAc_type);
a_this->sub_method = (profile_method_class*)profile->sub_method;
fopAcTg_Init(&a_this->mAcTg, a_this);
fopAcTg_ToActorQ(&a_this->mAcTg);
fopDwTg_Init(&a_this->mDwTg, a_this);
fopAcTg_Init(&a_this->actor_tag, a_this);
fopAcTg_ToActorQ(&a_this->actor_tag);
fopDwTg_Init(&a_this->draw_tag, a_this);
a_this->mStatus = profile->mStatus;
a_this->mGroup = profile->mActorType;
a_this->mCullType = profile->mCullType;
a_this->actor_status = profile->status;
a_this->group = profile->mActorType;
a_this->cullType = profile->cullType;
fopAcM_prm_class* append = fopAcM_GetAppend(a_this);
if (append != NULL) {
fopAcM_SetParam(a_this, append->mParameter);
a_this->orig.pos = append->mPos;
a_this->orig.angle = append->mAngle;
a_this->home.pos = append->mPos;
a_this->home.angle = append->mAngle;
a_this->shape_angle = append->mAngle;
a_this->mParentPcId = append->mParentPId;
a_this->mSubtype = append->mSubtype;
a_this->mScale.set(append->mScale[0] * 0.1f, append->mScale[1] * 0.1f,
a_this->parentActorID = append->mParentPId;
a_this->subtype = append->mSubtype;
a_this->scale.set(append->mScale[0] * 0.1f, append->mScale[1] * 0.1f,
append->mScale[2] * 0.1f);
a_this->mSetID = append->mEnemyNo;
a_this->orig.roomNo = append->mRoomNo;
a_this->setID = append->mEnemyNo;
a_this->home.roomNo = append->mRoomNo;
}
a_this->next = a_this->orig;
a_this->current = a_this->orig;
a_this->mEyePos = a_this->orig.pos;
a_this->mMaxFallSpeed = -100.0f;
a_this->mAttentionInfo.field_0x0[0] = 1;
a_this->mAttentionInfo.field_0x0[1] = 2;
a_this->mAttentionInfo.field_0x0[2] = 3;
a_this->mAttentionInfo.field_0x0[3] = 5;
a_this->mAttentionInfo.field_0x0[4] = 6;
a_this->mAttentionInfo.field_0x0[7] = 14;
a_this->mAttentionInfo.field_0x0[5] = 15;
a_this->mAttentionInfo.field_0x0[6] = 15;
a_this->mAttentionInfo.field_0x0[8] = 51;
a_this->mAttentionInfo.mPosition = a_this->orig.pos;
a_this->mAttentionInfo.field_0xa = 30;
dKy_tevstr_init(&a_this->mTevStr, a_this->orig.roomNo, -1);
a_this->old = a_this->home;
a_this->current = a_this->home;
a_this->eyePos = a_this->home.pos;
a_this->maxFallSpeed = -100.0f;
a_this->attention_info.field_0x0[0] = 1;
a_this->attention_info.field_0x0[1] = 2;
a_this->attention_info.field_0x0[2] = 3;
a_this->attention_info.field_0x0[3] = 5;
a_this->attention_info.field_0x0[4] = 6;
a_this->attention_info.field_0x0[7] = 14;
a_this->attention_info.field_0x0[5] = 15;
a_this->attention_info.field_0x0[6] = 15;
a_this->attention_info.field_0x0[8] = 51;
a_this->attention_info.position = a_this->home.pos;
a_this->attention_info.field_0xa = 30;
dKy_tevstr_init(&a_this->tevStr, a_this->home.roomNo, -1);
int roomNo = dComIfGp_roomControl_getStayNo();
if (roomNo >= 0) {
@@ -184,22 +184,22 @@ static int fopAc_Create(void* i_this) {
}
dStage_FileList_dt_c* filelist = NULL;
if (a_this->orig.roomNo >= 0) {
if (a_this->home.roomNo >= 0) {
filelist =
dComIfGp_roomControl_getStatusRoomDt(a_this->orig.roomNo)->mRoomDt.getFileListInfo();
dComIfGp_roomControl_getStatusRoomDt(a_this->home.roomNo)->mRoomDt.getFileListInfo();
}
if (filelist != NULL) {
if (!dStage_FileList_dt_GetEnemyAppear1Flag(filelist)) {
u32 sw = dStage_FileList_dt_GetBitSw(filelist);
if (sw != 0xFF && dComIfGs_isSwitch(sw, a_this->orig.roomNo) &&
if (sw != 0xFF && dComIfGs_isSwitch(sw, a_this->home.roomNo) &&
profile->mActorType == fopAc_ENEMY_e)
{
return cPhs_ERROR_e;
}
} else {
u32 sw = dStage_FileList_dt_GetBitSw(filelist);
if (sw != 0xFF && !dComIfGs_isSwitch(sw, a_this->orig.roomNo) &&
if (sw != 0xFF && !dComIfGs_isSwitch(sw, a_this->home.roomNo) &&
profile->mActorType == fopAc_ENEMY_e)
{
return cPhs_ERROR_e;
@@ -208,10 +208,10 @@ static int fopAc_Create(void* i_this) {
}
}
int ret = fpcMtd_Create((process_method_class*)a_this->mSubMtd, a_this);
int ret = fpcMtd_Create((process_method_class*)a_this->sub_method, a_this);
if (ret == cPhs_COMPLEATE_e) {
s32 priority = fpcLf_GetPriority(a_this);
fopDwTg_ToDrawQ(&a_this->mDwTg, priority);
fopDwTg_ToDrawQ(&a_this->draw_tag, priority);
} else if (ret == cPhs_ERROR_e) {
fopAcM_OnCondition(a_this, 0x10);
}
src/f_op/f_op_actor_mng.cpp
+341 -298
View File
File diff suppressed because it is too large Load Diff
src/f_op/f_op_camera.cpp
+1 -1
View File
@@ -91,7 +91,7 @@ static int fopCam_Create(void* i_this) {
if (fpcM_IsFirstCreating(i_this)) {
camera_process_profile_definition* profile =
(camera_process_profile_definition*)fpcM_GetProfile(i_this);
_this->mpMtd = profile->mSubMtd;
_this->mpMtd = profile->sub_method;
fopDwTg_Init(&_this->mCreateTag, _this);
u32* append = (u32*)fpcM_GetAppend(_this);
src/f_op/f_op_kankyo.cpp
+10 -10
View File
@@ -16,7 +16,7 @@ static int fopKy_Draw(void* i_this) {
kankyo_class* _this = (kankyo_class*)i_this;
if (!dComIfGp_isPauseFlag()) {
ret = fpcLf_DrawMethod(_this->mSubMtd, i_this);
ret = fpcLf_DrawMethod(_this->sub_method, i_this);
}
return ret;
@@ -28,7 +28,7 @@ static int fopKy_Execute(void* i_this) {
kankyo_class* _this = (kankyo_class*)i_this;
if (dScnPly_c::isPause() && (!dComIfGp_isPauseFlag() || fpcM_GetName(i_this) == PROC_ENVSE)) {
ret = fpcMtd_Execute(&_this->mSubMtd->mBase, i_this);
ret = fpcMtd_Execute(&_this->sub_method->mBase, i_this);
}
return ret;
@@ -39,9 +39,9 @@ static int fopKy_IsDelete(void* i_this) {
int ret;
kankyo_class* _this = (kankyo_class*)i_this;
ret = fpcMtd_IsDelete(&_this->mSubMtd->mBase, _this);
ret = fpcMtd_IsDelete(&_this->sub_method->mBase, _this);
if (ret == 1) {
fopDwTg_DrawQTo(&_this->mDwTg);
fopDwTg_DrawQTo(&_this->draw_tag);
}
return ret;
@@ -51,8 +51,8 @@ static int fopKy_IsDelete(void* i_this) {
static int fopKy_Delete(void* i_this) {
kankyo_class* _this = (kankyo_class*)i_this;
int ret = fpcMtd_Delete(&_this->mSubMtd->mBase, _this);
fopDwTg_DrawQTo(&_this->mDwTg);
int ret = fpcMtd_Delete(&_this->sub_method->mBase, _this);
fopDwTg_DrawQTo(&_this->draw_tag);
return ret;
}
@@ -70,9 +70,9 @@ static int fopKy_Create(void* i_this) {
(kankyo_process_profile_definition*)fpcM_GetProfile(i_this);
_this->mBsType = fpcBs_MakeOfType(&fopKy_KANKYO_TYPE);
_this->mSubMtd = profile->mSubMtd;
_this->sub_method = profile->sub_method;
fopDwTg_Init(&_this->mDwTg, _this);
fopDwTg_Init(&_this->draw_tag, _this);
fopKyM_prm_class* append = (fopKyM_prm_class*)fopKyM_GetAppend(_this);
if (append != NULL) {
@@ -82,10 +82,10 @@ static int fopKy_Create(void* i_this) {
}
}
int ret = fpcMtd_Create(&_this->mSubMtd->mBase, _this);
int ret = fpcMtd_Create(&_this->sub_method->mBase, _this);
if (ret == cPhs_COMPLEATE_e) {
s32 priority = fpcLf_GetPriority(_this);
fopDwTg_ToDrawQ(&_this->mDwTg, priority);
fopDwTg_ToDrawQ(&_this->draw_tag, priority);
}
return ret;
src/f_op/f_op_msg.cpp
+10 -10
View File
@@ -12,7 +12,7 @@
/* 8001F488-8001F4B0 019DC8 0028+00 1/0 0/0 0/0 .text fopMsg_Draw__FPv */
static int fopMsg_Draw(void* i_this) {
msg_class* _this = static_cast<msg_class*>(i_this);
return fpcLf_DrawMethod(_this->mSubMtd, i_this);
return fpcLf_DrawMethod(_this->sub_method, i_this);
}
/* 8001F4B0-8001F4E8 019DF0 0038+00 1/0 0/0 0/0 .text fopMsg_Execute__FPv */
@@ -21,7 +21,7 @@ static int fopMsg_Execute(void* i_this) {
int stat = 1;
if (dScnPly_c::isPause()) {
stat = fpcMtd_Execute(&_this->mSubMtd->mBase, i_this);
stat = fpcMtd_Execute(&_this->sub_method->mBase, i_this);
}
return stat;
@@ -31,9 +31,9 @@ static int fopMsg_Execute(void* i_this) {
static int fopMsg_IsDelete(void* i_this) {
msg_class* _this = static_cast<msg_class*>(i_this);
int stat = fpcMtd_IsDelete(&_this->mSubMtd->mBase, i_this);
int stat = fpcMtd_IsDelete(&_this->sub_method->mBase, i_this);
if (stat == 1) {
fopDwTg_DrawQTo(&_this->mDwTg);
fopDwTg_DrawQTo(&_this->draw_tag);
}
return stat;
@@ -43,8 +43,8 @@ static int fopMsg_IsDelete(void* i_this) {
static int fopMsg_Delete(void* i_this) {
msg_class* _this = static_cast<msg_class*>(i_this);
int stat = fpcMtd_Delete(&_this->mSubMtd->mBase, i_this);
fopDwTg_DrawQTo(&_this->mDwTg);
int stat = fpcMtd_Delete(&_this->sub_method->mBase, i_this);
fopDwTg_DrawQTo(&_this->draw_tag);
return stat;
}
@@ -61,8 +61,8 @@ int fopMsg_Create(void* i_this) {
msg_process_profile_definition* profile =
(msg_process_profile_definition*)fpcM_GetProfile(i_this);
_this->mMsgType = fpcBs_MakeOfType(&fopMsg_MSG_TYPE);
_this->mSubMtd = profile->mSubMtd;
fopDwTg_Init(&_this->mDwTg, _this);
_this->sub_method = profile->sub_method;
fopDwTg_Init(&_this->draw_tag, _this);
fopMsg_prm_class* prm = fopMsgM_GetAppend(_this);
if (prm != NULL) {
_this->mpActor = prm->mpActor;
@@ -73,10 +73,10 @@ int fopMsg_Create(void* i_this) {
}
}
int status = fpcMtd_Create(&_this->mSubMtd->mBase, _this);
int status = fpcMtd_Create(&_this->sub_method->mBase, _this);
if (status == cPhs_COMPLEATE_e) {
s32 priority = fpcLf_GetPriority(_this);
fopDwTg_ToDrawQ(&_this->mDwTg, priority);
fopDwTg_ToDrawQ(&_this->draw_tag, priority);
}
return status;
src/f_op/f_op_msg_mng.cpp
+1 -1
View File
@@ -177,7 +177,7 @@ int fopMsgM_messageSet(u32 i_msgIdx, fopAc_ac_c* i_actorP, u32 param_2) {
cXyz pos;
if (i_actorP) {
pos = i_actorP->mEyePos;
pos = i_actorP->eyePos;
} else {
pos.set(FLOAT_LABEL(lit_3902), FLOAT_LABEL(lit_3902), FLOAT_LABEL(lit_3902));
}
src/f_op/f_op_overlap.cpp
+1 -1
View File
@@ -40,7 +40,7 @@ static s32 fopOvlp_Create(void* i_this) {
(overlap_process_profile_definition*)fpcM_GetProfile(_this);
cReq_Create((request_base_class*)&_this->field_0xc4, 1);
_this->field_0xc0 = profile->mSubMtd;
_this->field_0xc0 = profile->sub_method;
_this->field_0xc8 = -1;
}
src/f_op/f_op_view.cpp
+6 -6
View File
@@ -8,23 +8,23 @@
/* 8001F1A8-8001F1D0 019AE8 0028+00 1/0 0/0 0/0 .text fopVw_Draw__FP10view_class */
void fopVw_Draw(view_class* i_this) {
fpcLf_DrawMethod(i_this->mSubMtd, i_this);
fpcLf_DrawMethod(i_this->sub_method, i_this);
}
/* 8001F1D0-8001F1F8 019B10 0028+00 1/0 0/0 0/0 .text fopVw_Execute__FP10view_class */
void fopVw_Execute(view_class* i_this) {
fpcMtd_Execute(&i_this->mSubMtd->mBase, i_this);
fpcMtd_Execute(&i_this->sub_method->mBase, i_this);
}
/* 8001F1F8-8001F220 019B38 0028+00 1/0 0/0 0/0 .text fopVw_IsDelete__FPv */
s32 fopVw_IsDelete(void* i_this) {
view_class* _this = (view_class*)i_this;
return fpcMtd_IsDelete(&_this->mSubMtd->mBase, _this);
return fpcMtd_IsDelete(&_this->sub_method->mBase, _this);
}
/* 8001F220-8001F248 019B60 0028+00 1/0 0/0 0/0 .text fopVw_Delete__FP10view_class */
s32 fopVw_Delete(view_class* i_this) {
return fpcMtd_Delete(&i_this->mSubMtd->mBase, i_this);
return fpcMtd_Delete(&i_this->sub_method->mBase, i_this);
}
/* 8001F248-8001F284 019B88 003C+00 1/0 0/0 0/0 .text fopVw_Create__FPv */
@@ -33,10 +33,10 @@ s32 fopVw_Create(void* i_this) {
view_process_profile_definition* pProf =
(view_process_profile_definition*)fpcM_GetProfile(_this);
_this->mSubMtd = pProf->mSubMtd;
_this->sub_method = pProf->sub_method;
_this->field_0xc4 = pProf->unk28;
return fpcMtd_Create(&_this->mSubMtd->mBase, _this);
return fpcMtd_Create(&_this->sub_method->mBase, _this);
}
/* ############################################################################################## */
src/f_pc/f_pc_base.cpp
+1 -1
View File
@@ -102,7 +102,7 @@ base_process_class* fpcBs_Create(s16 i_procTypeID, unsigned int i_procID, void*
procClass->mBsType = fpcBs_MakeOfType(&g_fpcBs_type);
procClass->mProcName = procProfDef->mProcName;
fpcPause_Init(procClass);
procClass->mpPcMtd = procProfDef->mSubMtd;
procClass->mpPcMtd = procProfDef->sub_method;
procClass->mpProf = procProfDef;
procClass->mpUserData = i_data;
procClass->mParameters = procProfDef->mParameters;
src/f_pc/f_pc_leaf.cpp
+1 -1
View File
@@ -52,7 +52,7 @@ s32 fpcLf_Create(leafdraw_class* i_leaf) {
leaf_process_profile_definition* profDef;
if (i_leaf->mBase.mInitState == 0) {
profDef = (leaf_process_profile_definition*)i_leaf->mBase.mpProf;
i_leaf->mpDrawMtd = profDef->mSubMtd;
i_leaf->mpDrawMtd = profDef->sub_method;
i_leaf->mBase.mSubType = fpcBs_MakeOfType(&g_fpcLf_type);
fpcDwPi_Init(&i_leaf->mDwPi, profDef->mPriority);
i_leaf->mbUnk0 = 0;
src/f_pc/f_pc_node.cpp
+1 -1
View File
@@ -98,7 +98,7 @@ s32 fpcNd_Create(process_node_class* i_procNode) {
node_process_profile_definition* pProcProfileDef =
(node_process_profile_definition*)pProcNode->mBase.mpProf;
pProcNode->mBase.mSubType = fpcBs_MakeOfType(&g_fpcNd_type);
pProcNode->mpNodeMtd = (nodedraw_method_class*)pProcProfileDef->mSubMtd;
pProcNode->mpNodeMtd = (nodedraw_method_class*)pProcProfileDef->sub_method;
fpcLy_Create(&pProcNode->mLayer, pProcNode, pProcNode->mLayerNodeLists, 0x10);
pProcNode->mUnk0 = 0;
}
src/m_Do/m_Do_graphic.cpp
+1 -1
View File
@@ -635,7 +635,7 @@ static void drawDepth2(view_class* param_0, view_port_class* param_1, int param_
fopAcM_SearchByID(daPy_getLinkPlayerActorClass()->getAtnActorID());
if (atn_actor != NULL) {
cXyz sp28 = atn_actor->mEyePos;
cXyz sp28 = atn_actor->eyePos;
if (fabsf(sp28.y - camera_p->mLookat.mEye.y) < 400.0f) {
sp28.y = camera_p->mLookat.mEye.y;
}