mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-09-06 10:55:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_mg_rod a little closer to matching (#2857)

Browse Source 
* closer to matching

* build error fix

* PR cleanup
This commit is contained in:
Carco_21
2025-11-25 11:36:25 -05:00
committed by GitHub
parent 9e232b61fb
commit f5e3e89512
3 changed files with 326 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_mg_fish.cpp
+3 -3
View File
@@ -95,7 +95,7 @@ static void hit_vib_set(mg_fish_class* i_this) {
static s32 vib_p[4] = { 1, 2, 3, 4 };
dmg_rod_class* rod = (dmg_rod_class*)fopAcM_SearchByID(i_this->mRodId);
if (rod != NULL && rod->field_0x10ab == 0) {
if (rod != NULL && rod->vib_timer == 0) {
s32 vib_index = (rod->field_0xf60 - 100.0f) * 0.02f;
if (vib_index < 0) {
vib_index = 0;
@@ -1584,8 +1584,8 @@ static void mf_lure_search(mg_fish_class* i_this) {
rod->field_0x1410 = 0.0f;
dKy_Sound_set(i_this->actor.current.pos, 40.0f * i_this->mJointScale,
fopAcM_GetID(i_this), 5);
rod->field_0x10ab = 5;
rod->field_0x10aa = 3;
rod->vib_timer = 5;
rod->vibmode = VIBMODE_S_POWER3;
break;
}