d_a_mg_rod a little closer to matching (#2857)

* 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 b72e4ce104
commit fab02be7b9
3 changed files with 326 additions and 293 deletions
+4 -3
View File
@@ -79,7 +79,8 @@ struct wd_ss;
*
* @details
*
*/
*/
class dmg_rod_class {
public:
f32 getRodStickX() { return rod_stick_x; }
@@ -205,8 +206,8 @@ public:
/* 0x10A7 */ s8 field_0x10a7;
/* 0x10A8 */ s8 field_0x10a8;
/* 0x10A9 */ s8 field_0x10a9;
/* 0x10AA */ u8 field_0x10aa;
/* 0x10AB */ u8 field_0x10ab;
/* 0x10AA */ u8 vibmode;
/* 0x10AB */ u8 vib_timer;
/* 0x10AC */ fpc_ProcID mg_fish_id;
/* 0x10B0 */ s16 field_0x10b0;
/* 0x10B4 */ Z2Creature sound;
+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;
}
+319 -287
View File
File diff suppressed because it is too large Load Diff