mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-08 06:30:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

e_rdy mostly done (#2324)

Browse Source 
* e_rdy work

* e_rdy work

* e_rdy work

* e_rdy mostly done

* e_rdy fix hit direction
This commit is contained in:
Caroline Madsen
2025-03-12 19:02:03 -04:00
committed by GitHub
parent 3ad60c1b17
commit 15a807bb7b
10 changed files with 5147 additions and 2719 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_alink_link.inc
+1 -1
View File
@@ -2709,7 +2709,7 @@ int daAlink_c::execute() {
}
}
if (checkEndResetFlg0(ERFLG0_UNK_1000000) && mEquipItem == 0x103) {
if (checkEndResetFlg0(ERFLG0_ENEMY_DEAD) && mEquipItem == 0x103) {
mSwordFlourishTimer = daAlinkHIO_cut_c0::m.mFlourishTime;
}
src/d/actor/d_a_e_rdy.cpp
+4946 -2693
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_e_wb.cpp
-6
View File
@@ -2490,12 +2490,6 @@ static void demo_camera(e_wb_class* param_0) {
// NONMATCHING
}
/* 807DFAB4-807DFAD8 00D714 0024+00 1/1 0/0 0/0 .text fadeIn__13mDoGph_gInf_cFfR8_GXColor
*/
void mDoGph_gInf_c::fadeIn(f32 param_0, _GXColor& param_1) {
// NONMATCHING
}
/* 807DFAD8-807DFAEC 00D738 0014+00 1/1 0/0 0/0 .text checkSkipEdge__14dEvt_control_cFv
*/
extern "C" void checkSkipEdge__14dEvt_control_cFv() {
src/d/actor/d_a_e_yc.cpp
+8 -8
View File
@@ -140,7 +140,7 @@ static void e_yc_fly(e_yc_class* i_this) {
case 3:
target_speed = 25.0f;
if (rider->field_0x1372 > 200) {
if (rider->mDemoTimer > 200) {
target_speed = 35.0f;
accel = 0.25f;
}
@@ -150,10 +150,10 @@ static void e_yc_fly(e_yc_class* i_this) {
case 4:
accel = 0.3f;
if (rider->field_0x1372 == 30) {
if (rider->mDemoTimer == 30) {
anm_init(i_this, e_yc_class::ANM_FLY_BRAKE, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
}
if (rider->field_0x1372 == 60) {
if (rider->mDemoTimer == 60) {
anm_init(i_this, e_yc_class::ANM_HOVERING, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
}
i_this->mMaxAngleSpeed = 300.0f;
@@ -361,8 +361,8 @@ static void e_yc_attack(e_yc_class* i_this) {
break;
case 4:
if (frame == 11 && rider->field_0x1370 == 0 & i_this->mDistToPlayer < 200.0f) {
rider->field_0x1370 = 1;
if (frame == 11 && rider->mDemoMode == 0 & i_this->mDistToPlayer < 200.0f) {
rider->mDemoMode = 1;
i_this->mCreatureSound.startCreatureSound(Z2SE_EN_YC_HIT_SIDE, 0, -1);
}
@@ -371,7 +371,7 @@ static void e_yc_attack(e_yc_class* i_this) {
cLib_addCalc2(&i_this->current.pos.z, i_this->mTargetPos.z, 1.0f, 30.0f);
if (i_this->mpMorf->isStop()) {
if (rider->field_0x1370 == 0) {
if (rider->mDemoMode == 0) {
i_this->mAction = e_yc_class::ACT_HOVERING;
i_this->mMode = 0;
} else {
@@ -394,7 +394,7 @@ static void e_yc_attack(e_yc_class* i_this) {
case 6:
if (frame == 30) {
rider->field_0x1370 = 3;
rider->mDemoMode = 3;
}
if (i_this->mpMorf->isStop()) {
@@ -474,7 +474,7 @@ static void e_yc_wolfbite(e_yc_class* i_this) {
anm_init(i_this, e_yc_class::ANM_HANGED_BRUSH2, 3.0f,
J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
i_this->mMode = 3;
rider->field_0x1370 = 5;
rider->mDemoMode = 5;
dScnPly_c::setPauseTimer(7);
i_this->mCreatureSound.startCollisionSE(Z2SE_HIT_WOLFBITE, 0x20);
dComIfGp_setHitMark(3, i_this, &player->eyePos, &player->shape_angle, NULL, 0);