From f2bb2bb4a75a60636b5ff2ee1cbde5ac9daf2ce4 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Sat, 13 Jan 2024 00:51:57 -0500 Subject: [PATCH] Stts weight cleanup --- include/d/d_cc_d.h | 2 +- src/c/c_damagereaction.cpp | 4 ++-- src/d/actor/d_a_am.cpp | 2 +- src/d/actor/d_a_am2.cpp | 2 +- src/d/actor/d_a_bk.cpp | 2 +- src/d/actor/d_a_hookshot.cpp | 2 +- src/d/actor/d_a_player_main.cpp | 2 +- src/d/d_cc_d.cpp | 4 ++-- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/d/d_cc_d.h b/include/d/d_cc_d.h index cb112e473..e5c1b1004 100644 --- a/include/d/d_cc_d.h +++ b/include/d/d_cc_d.h @@ -136,7 +136,7 @@ public: virtual cCcD_GStts* GetGStts() { return (cCcD_GStts*)this; } - void Init(int, int, fopAc_ac_c*); + void Init(int weight, int, fopAc_ac_c* pActor); virtual void Ct(); virtual void ClrAt() { cCcD_Stts::ClrAt(); diff --git a/src/c/c_damagereaction.cpp b/src/c/c_damagereaction.cpp index fecdba0a0..51fd3c0a4 100644 --- a/src/c/c_damagereaction.cpp +++ b/src/c/c_damagereaction.cpp @@ -176,7 +176,7 @@ BOOL enemy_ice(enemyice* ei) { switch (ei->mState) { case 0: // Not initialized // Initialize the enemyice now. - ei->mStts.Init(0xFA, 0xFF, ac); + ei->mStts.Init(250, 0xFF, ac); ei->mCyl.Set(cc_cyl_src); ei->mCyl.SetStts(&ei->mStts); ei->mCyl.SetR(ei->mWallRadius); @@ -468,7 +468,7 @@ void enemy_fire(enemyfire* ef) { ef->mFlameScaleY = 2.0f; } - ef->mStts.Init(0xFA, 0xFF, ac); + ef->mStts.Init(250, 0xFF, ac); ef->mSph.Set(fire_at_sph_src); ef->mSph.SetStts(&ef->mStts); break; diff --git a/src/d/actor/d_a_am.cpp b/src/d/actor/d_a_am.cpp index dbc4ddc65..174a620af 100644 --- a/src/d/actor/d_a_am.cpp +++ b/src/d/actor/d_a_am.cpp @@ -1244,7 +1244,7 @@ static s32 daAM_Create(fopAc_ac_c* i_actor) { &fopAcM_GetPosition_p(i_this), &fopAcM_GetOldPosition_p(i_this), i_this, 1, &i_this->mAcchCir, &fopAcM_GetSpeed_p(i_this) ); - i_this->mStts.Init(0xFE, 1, i_this); + i_this->mStts.Init(254, 1, i_this); i_this->mGravity = -10.0f; diff --git a/src/d/actor/d_a_am2.cpp b/src/d/actor/d_a_am2.cpp index 676e8dddf..9625408d6 100644 --- a/src/d/actor/d_a_am2.cpp +++ b/src/d/actor/d_a_am2.cpp @@ -1350,7 +1350,7 @@ static s32 daAM2_Create(fopAc_ac_c* i_actor) { &fopAcM_GetPosition_p(i_this), &fopAcM_GetOldPosition_p(i_this), i_this, 1, &i_this->mAcchCir, &fopAcM_GetSpeed_p(i_this) ); - i_this->mStts.Init(0xFE, 1, i_this); + i_this->mStts.Init(254, 1, i_this); i_this->mGravity = -3.0f; diff --git a/src/d/actor/d_a_bk.cpp b/src/d/actor/d_a_bk.cpp index 3847691a8..ee9a648f6 100644 --- a/src/d/actor/d_a_bk.cpp +++ b/src/d/actor/d_a_bk.cpp @@ -825,7 +825,7 @@ static s32 daBk_Create(fopAc_ac_c* i_actor) { i_this->mMaxHealth = i_this->mHealth = 5; } - i_this->mDamageReaction.mStts.Init(0xC8, 0xFF, i_this); + i_this->mDamageReaction.mStts.Init(200, 0xFF, i_this); static dCcD_SrcCyl co_cyl_src = {}; // TODO i_this->m0B88.Set(co_cyl_src); i_this->m0B88.SetStts(&i_this->mDamageReaction.mStts); diff --git a/src/d/actor/d_a_hookshot.cpp b/src/d/actor/d_a_hookshot.cpp index 19e7cadd7..053ba4236 100644 --- a/src/d/actor/d_a_hookshot.cpp +++ b/src/d/actor/d_a_hookshot.cpp @@ -370,7 +370,7 @@ s32 daHookshot_c::create() { procWait_init(FALSE); mGravity = -5.0f; - mStts.Init(0xA, 0xFF, this); + mStts.Init(10, 0xFF, this); mCps.Set(l_at_cps_src); mCps.SetStts(&mStts); diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp index d9e6d951c..fd851a71b 100644 --- a/src/d/actor/d_a_player_main.cpp +++ b/src/d/actor/d_a_player_main.cpp @@ -3500,7 +3500,7 @@ void daPy_lk_c::playerInit() { mCameraInfoIdx = dComIfGp_getPlayerCameraID(0); mpAttention = &dComIfGp_getAttention(); - mStts.Init(0x78, 0xFF, this); + mStts.Init(120, 0xFF, this); mCyl.Set(l_cyl_src); mCyl.SetStts(&mStts); mCyl.OnTgShieldFrontRange(); diff --git a/src/d/d_cc_d.cpp b/src/d/d_cc_d.cpp index 4591b90b2..04cd4d8d9 100644 --- a/src/d/d_cc_d.cpp +++ b/src/d/d_cc_d.cpp @@ -62,14 +62,14 @@ void dCcD_GStts::Move() { } /* 800AB3DC-800AB46C .text Init__9dCcD_SttsFiiP10fopAc_ac_c */ -void dCcD_Stts::Init(int param_0, int param_1, fopAc_ac_c* pActor) { +void dCcD_Stts::Init(int weight, int param_1, fopAc_ac_c* pActor) { u32 procId; if (pActor) { procId = fpcM_GetID(pActor); } else { procId = fpcM_ERROR_PROCESS_ID_e; } - cCcD_Stts::Init(param_0, param_1, pActor, procId); + cCcD_Stts::Init(weight, param_1, pActor, procId); s32 roomNo; if (pActor) {