mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-14 03:52:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_npc_kn work (#2274)

Browse Source 
* checkpoint

* checkpoint

* checkpoint

* checkpoint

* checkpoint

* fixups

* check

* fixes 2

* fixes 3

* fixes 4

* fixes 5

---------

Co-authored-by: pheenoh <pheenoh@macmini.local>
Co-authored-by: pheenoh <pheenoh@macmini.lan>
This commit is contained in:
Howard Luck
2025-06-08 12:01:18 -06:00
committed by GitHub
parent 1a7b14537c
commit 5ec7e42c2d
21 changed files with 7606 additions and 4514 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_alink_cut.inc
+1 -1
View File
@@ -710,7 +710,7 @@ BOOL daAlink_c::checkDoCutAction() {
/* 800D2890-800D28F4 0CD1D0 0064+00 2/2 0/0 0/0 .text checkCutBackState__9daAlink_cFv */
BOOL daAlink_c::checkCutBackState() {
// event flag 0x2902: Learned Backslice
return dComIfGs_isEventBit(0x2902) || checkNoResetFlg3(FLG3_UNK_20);
return dComIfGs_isEventBit(0x2902) || checkNoResetFlg3(FL3_TRANING_CUT_BACK);
}
/* 800D28F4-800D29D4 0CD234 00E0+00 6/6 0/0 0/0 .text checkCutHeadState__9daAlink_cFv */
src/d/actor/d_a_alink_damage.inc
+2 -2
View File
@@ -200,7 +200,7 @@ int daAlink_c::setDamagePoint(int i_dmgAmount, int i_checkZoraMag, int i_setDmgT
dComIfGp_setItemLifeCount(-magnified_dmg, 0);
}
onResetFlg1(RFLG1_UNK_400);
onResetFlg1(RFLG1_DAMAGE_IMPACT);
mSwordUpTimer = 0;
if (i_setDmgTimer) {
@@ -1429,7 +1429,7 @@ int daAlink_c::procLargeDamageUp() {
} else if (dMsgObject_isTalkNowCheck()) {
offNoResetFlg0(FLG0_UNK_200000);
}
} else if (checkEndResetFlg1(ERFLG1_UNK_8000000) && temp_r30->getFrame() > field_0x3484) {
} else if (checkEndResetFlg1(ERFLG1_LARGE_DAMAGE_UP_STOP) && temp_r30->getFrame() > field_0x3484) {
temp_r30->setFrame(field_0x3484);
getNowAnmPackUnder(UNDER_0)->setFrame(field_0x3484);
}
src/d/actor/d_a_alink_wolf.inc
+1 -1
View File
@@ -6021,7 +6021,7 @@ int daAlink_c::procWolfLargeDamageUp() {
}
} else if (temp_r29->getFrame() > field_0x3478) {
checkNextActionWolf(1);
} else if (checkEndResetFlg1(ERFLG1_UNK_8000000) && temp_r29->getFrame() > field_0x3484) {
} else if (checkEndResetFlg1(ERFLG1_LARGE_DAMAGE_UP_STOP) && temp_r29->getFrame() > field_0x3484) {
temp_r29->setFrame(field_0x3484);
getNowAnmPackUnder(UNDER_0)->setFrame(field_0x3484);
}
src/d/actor/d_a_e_yk.cpp
+586 -131
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_npc4.cpp
+3 -3
View File
@@ -97,7 +97,7 @@ void daNpcF_MatAnm_c::initialize() {
mNowOffsetX = 0.0f;
mNowOffsetY = 0.0f;
mEyeMoveFlag = 0;
field_0x105 = 0;
mMorfFrm = 0;
}
/* 8015075C-80150870 14B09C 0114+00 1/0 0/0 0/0 .text calc__15daNpcF_MatAnm_cCFP11J3DMaterial */
@@ -109,8 +109,8 @@ void daNpcF_MatAnm_c::calc(J3DMaterial* i_material) const {
J3DTexMtxInfo* curr_mtx_info =
&i_material->getTexGenBlock()->getTexMtx(i)->getTexMtxInfo();
if (field_0x105 != 0) {
f32 tmp8 = 1.0f / (field_0x105 + 1);
if (mMorfFrm != 0) {
f32 tmp8 = 1.0f / (mMorfFrm + 1);
f32 tmp9 = (1.0f - tmp8);
f32 tmp10 = field_0xF4 * (1.0f - tmp8);
src/d/actor/d_a_npc_hanjo.cpp
+1 -1
View File
@@ -104,7 +104,7 @@ SECTION_DATA static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[10] = {
};
/* 80A00B34-80A00DB8 0001F4 0284+00 1/2 0/0 0/0 .data l_motionAnmData */
SECTION_DATA static int l_motionAnmData[161] = {
SECTION_DATA static int l_motionAnmData[161] = {
11, 2, 1, 17, 0, 1, 65536, 22, 2, 2, 17, 0, 1, 65536, 16, 2, 2, 17, 0, 1, 65536,
13, 2, 2, 17, 0, 1, 65536, 21, 2, 2, 31, 2, 2, 0, 20, 0, 2, 30, 0, 2, 0,
14, 0, 2, 29, 0, 2, 0, 8, 2, 1, 17, 0, 1, 65536, 6, 0, 1, 17, 0, 1, 65536,
src/d/actor/d_a_npc_kn.cpp
+6531 -4163
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_npc_maro.cpp
+2 -2
View File
@@ -995,9 +995,9 @@ void daNpc_Maro_c::action() {
/* 8055D5C4-8055D688 002124 00C4+00 1/0 0/0 0/0 .text beforeMove__12daNpc_Maro_cFv */
void daNpc_Maro_c::beforeMove() {
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_8000000);
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_80000000);
if (checkHide()) {
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_8000000);
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_80000000);
}
if (checkHide() || mNoDraw) {
attention_info.flags = 0;
src/d/actor/d_a_npc_taro.cpp
+2 -2
View File
@@ -1056,9 +1056,9 @@ void daNpc_Taro_c::action() {
/* 80567EB4-80567F78 002114 00C4+00 1/0 0/0 0/0 .text beforeMove__12daNpc_Taro_cFv */
void daNpc_Taro_c::beforeMove() {
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_8000000);
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_80000000);
if (checkHide()) {
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_8000000);
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_80000000);
}
if (checkHide() || mNoDraw) {
attention_info.flags = 0;