mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-05 11:33:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_e_dt, d_a_e_ot equivalent (#2305)

Browse Source
This commit is contained in:
Caroline Madsen
2025-02-21 01:44:54 -05:00
committed by GitHub
parent 0c2335b6bf
commit f628e2e6ff
11 changed files with 3682 additions and 3266 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_alink_damage.inc
+4 -4
View File
@@ -61,7 +61,7 @@ void daAlink_c::freezeTimerDamage() {
/* 800D6F00-800D6F2C 0D1840 002C+00 1/0 0/0 0/0 .text onPressedDamage__9daAlink_cFRC4cXyzs */
void daAlink_c::onPressedDamage(cXyz const& param_0, s16 param_1) {
onNoResetFlg2(FLG2_UNK_1000);
onNoResetFlg2(FLG2_PRESSED_DAMAGE);
field_0x3104 = param_1;
field_0x3744 = param_0;
}
@@ -478,7 +478,7 @@ BOOL daAlink_c::checkDamageAction() {
return procCoSandWallHitInit();
}
if (checkNoResetFlg2(FLG2_UNK_1000)) {
if (checkNoResetFlg2(FLG2_PRESSED_DAMAGE)) {
if (commonLargeDamageUpInit(-4, 1, 0, 0)) {
current.pos = field_0x3744;
shape_angle.y = field_0x3104;
@@ -1261,7 +1261,7 @@ int daAlink_c::procLargeDamageUpInit(int param_0, int param_1, s16 param_2, s16
mProcVar4.field_0x3010 = 0;
if (param_0 == -4) {
onNoResetFlg2(FLG2_UNK_1000);
onNoResetFlg2(FLG2_PRESSED_DAMAGE);
mProcVar0.field_0x3008 = 0;
mProcVar1.field_0x300a = 1;
mProcVar2.field_0x300c = 1;
@@ -1380,7 +1380,7 @@ int daAlink_c::procLargeDamageUp() {
onEndResetFlg0(ERFLG0_UNK_8000000);
if (field_0x3198 == -4) {
if (checkNoResetFlg2(FLG2_UNK_1000)) {
if (checkNoResetFlg2(FLG2_PRESSED_DAMAGE)) {
return 1;
}
src/d/actor/d_a_alink_link.inc
+1 -1
View File
@@ -4478,7 +4478,7 @@ BOOL daAlink_c::subjectCancelTrigger() {
int daAlink_c::checkSubjectEnd(BOOL i_playSound) {
setDoStatus(0x12);
if (checkEventRun() || checkEquipAnime() || doTrigger() || checkSetItemTrigger(fpcNm_ITEM_HAWK_EYE) || subjectCancelTrigger() || checkEndResetFlg0(ERFLG0_UNK_80000000) || dComIfGp_checkCameraAttentionStatus(field_0x317c, 0x2000)) {
if (checkEventRun() || checkEquipAnime() || doTrigger() || checkSetItemTrigger(fpcNm_ITEM_HAWK_EYE) || subjectCancelTrigger() || checkEndResetFlg0(ERFLG0_FORCE_SUBJECT_CANCEL) || dComIfGp_checkCameraAttentionStatus(field_0x317c, 0x2000)) {
if (i_playSound) {
seStartSystem(Z2SE_SUBJ_VIEW_OUT);
}
src/d/actor/d_a_alink_wolf.inc
+2 -2
View File
@@ -5868,7 +5868,7 @@ int daAlink_c::procWolfLargeDamageUpInit(int param_0, int param_1, s16 param_2,
field_0x3478 = daAlinkHIO_wlDamLarge_c0::m.field_0x0.mCancelFrame;
if (param_0 == -4) {
onNoResetFlg2(FLG2_UNK_1000);
onNoResetFlg2(FLG2_PRESSED_DAMAGE);
mProcVar0.field_0x3008 = 0;
var_f31 = 0.0f;
} else if (param_0 == -5 && mDemo.getParam1() > 0) {
@@ -5958,7 +5958,7 @@ int daAlink_c::procWolfLargeDamageUp() {
}
if (field_0x319c == -4) {
if (checkNoResetFlg2(FLG2_UNK_1000)) {
if (checkNoResetFlg2(FLG2_PRESSED_DAMAGE)) {
return 1;
}
temp_r29->setRate(daAlinkHIO_wlDamLarge_c0::m.field_0x0.mSpeed);
src/d/actor/d_a_e_dt.cpp
+2601 -2127
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_e_ot.cpp
+852 -1089
View File
File diff suppressed because it is too large Load Diff