mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-11 07:25:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_e_hp almost matching (#2585)

Browse Source
This commit is contained in:
Max Roncace
2025-08-15 05:50:49 -04:00
committed by GitHub
parent a6802bf7a2
commit 41c72dc6d9
17 changed files with 1341 additions and 810 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_e_hp.cpp
+1227 -775
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_e_zh.cpp
+1 -1
View File
@@ -859,7 +859,7 @@ void daE_ZH_c::executeBallWait() {
spa4.z = WREG_F(1) + 2000.0f;
MtxPosition(&spa4, &spb0);
field_0x680 = spb0 + current.pos;
lin_chk.onBackFlag();
lin_chk.OnBackFlag();
lin_chk.Set(&current.pos, &field_0x680, this);
if (dComIfG_Bgsp().LineCross(&lin_chk)) {
src/d/actor/d_a_npc_moir.cpp
+2 -2
View File
@@ -1391,7 +1391,7 @@ bool daNpcMoiR_c::talk(void* param_1) {
} else {
msgTimer = mMsgTimer;
if (ctrlMsgAnm(i_expression, i_actionID, this, FALSE)) {
OS_REPORT("レジスタンスモイ 表情番号=%d 動作番号=%d\n", i_expressionID, i_actionID); // "Resistance Moi Expression Number=%d Action Number=%d\n"
OS_REPORT("レジスタンスモイ 表情番号=%d 動作番号=%d\n", i_expression, i_actionID); // "Resistance Moi Expression Number=%d Action Number=%d\n"
setExpression(i_expression, -1.0f);
setMotion(i_actionID, -1.0f, 0);
} else if (msgTimer != 0 && mMsgTimer == 0) {
@@ -1657,7 +1657,7 @@ BOOL daNpcMoiR_c::EvCut_Appear(int i_cutIndex) {
case '0005':
if (fopAcM_searchPlayerAngleY(this) == mCurAngle.y) {
if (talkProc(NULL, TRUE, NULL)) {
OS_REPORT("二択分岐 %s\n", getChoiceNo() == 0 ? "はい" : "いいえ");
OS_REPORT("二択分岐 %s\n", mFlow.getChoiceNo() == 0 ? "はい" : "いいえ");
if (mFlow.getChoiceNo() == 0) {
mOrderEvtNo = 3;
src/d/actor/d_a_tag_kmsg.cpp
+2 -2
View File
@@ -197,8 +197,8 @@ int daTag_KMsg_c::Execute() {
vec54.z = vec60.z + 80.0f * angle.Cos();
dBgS_LinChk lin_chk;
lin_chk.ClrSttsWallOff();
lin_chk.onBackFlag();
lin_chk.onFrontFlag();
lin_chk.OnBackFlag();
lin_chk.OnFrontFlag();
lin_chk.Set(&vec54, &vec60, NULL);
if (dComIfG_Bgsp().LineCross(&lin_chk)) {
cXyz vec48;
src/d/d_camera.cpp
+2 -2
View File
@@ -3396,8 +3396,8 @@ bool dCamera_c::bumpCheck(u32 i_flags) {
* lineBGCheckBoth__9dCamera_cFP4cXyzP4cXyzP11dBgS_LinChkUl */
bool dCamera_c::lineBGCheckBoth(cXyz* i_start, cXyz* i_end, dBgS_LinChk* i_linchk,
u32 i_flags) {
i_linchk->onBackFlag();
i_linchk->onFrontFlag();
i_linchk->OnBackFlag();
i_linchk->OnFrontFlag();
return lineBGCheck(i_start, i_end, i_linchk, i_flags);
}
src/d/d_event.cpp
+2 -2
View File
@@ -558,10 +558,10 @@ int dEvt_control_c::entry() {
void dEvt_control_c::reset() {
if (field_0xec != 0xFF) {
fopAc_ac_c* pt1 = getPt1();
fopAc_ac_c* pt1_2 = pt1;
s16 eventIdx = dComIfGp_getEventManager().getEventIdx(NULL, field_0xec, -1);
fopAc_ac_c* pt2 = getPt2();
order(EVT_TYPE_OTHER, 3, 0x201, mHindFlag, pt1, pt2, eventIdx, field_0xec);
order(EVT_TYPE_OTHER, 3, 0x201, mHindFlag, pt1, getPt2(), eventIdx, field_0xec);
mChangeOK = pt1;
}
src/f_op/f_op_actor_mng.cpp
+2 -2
View File
@@ -136,10 +136,10 @@ void fopAcM_Log(fopAc_ac_c const* i_actor, char const* i_message) {}
/* 80019C7C-80019CB8 0145BC 003C+00 0/0 10/10 483/483 .text fopAcM_delete__FP10fopAc_ac_c
*/
void fopAcM_delete(fopAc_ac_c* i_actor) {
s32 fopAcM_delete(fopAc_ac_c* i_actor) {
// "Deleting Actor"
fopAcM_Log(i_actor, "アクターの削除");
fpcM_Delete(i_actor);
return fpcM_Delete(i_actor);
}
/* 80019CB8-80019D18 0145F8 0060+00 0/0 3/3 12/12 .text fopAcM_delete__FUi */