diff options
| author | Aetias <144526980+AetiasHax@users.noreply.github.com> | 2025-08-29 20:01:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-08-29 20:01:10 +0200 |
| commit | cb52c8c23f5de5ba8509f9471025b4fa995e3b65 (patch) | |
| tree | 81523e43f3f948a47110db7bcb55bc96c60cdf05 /src/14_Land/Actor/Player/ActorRefill.cpp | |
| parent | be02098914d37fda7796a39d0c8332c2ab88c235 (diff) | |
ActorNavi (#132)
* Map symbol in Game
* ActorNavi 93%
* ActorNavi_04 96%
* Document Actor fields
* Move MAX_KEYS to ItemManager
* Move gTouchControl to its own header
* Fix missing includes
* Fix regressions
* Fix build
* Update decompiling guide images
* Fix regression
Diffstat (limited to 'src/14_Land/Actor/Player/ActorRefill.cpp')
| -rw-r--r-- | src/14_Land/Actor/Player/ActorRefill.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/14_Land/Actor/Player/ActorRefill.cpp b/src/14_Land/Actor/Player/ActorRefill.cpp index ea448a42..e556774b 100644 --- a/src/14_Land/Actor/Player/ActorRefill.cpp +++ b/src/14_Land/Actor/Player/ActorRefill.cpp @@ -57,18 +57,18 @@ ARM bool ActorRefill::Init() { return false; } } - mHitbox.pos.x = 0; - mHitbox.pos.y = FLOAT_TO_Q20(0.3); - mHitbox.pos.z = 0; - mHitbox.size = FLOAT_TO_Q20(0.3); - mUnk_08c.pos.x = mHitbox.pos.x; - mUnk_08c.pos.y = mHitbox.pos.y; - mUnk_08c.pos.z = mHitbox.pos.z; - mUnk_08c.size = mHitbox.size; - mUnk_0a4.mUnk_04.x = 0; - mUnk_0a4.mUnk_04.y = FLOAT_TO_Q20(0.3); - mUnk_0a4.mUnk_04.z = 0; - mUnk_0a4.mUnk_10 = FLOAT_TO_Q20(1.3); + mHitbox.pos.x = 0; + mHitbox.pos.y = FLOAT_TO_Q20(0.3); + mHitbox.pos.z = 0; + mHitbox.size = FLOAT_TO_Q20(0.3); + mUnk_08c.pos.x = mHitbox.pos.x; + mUnk_08c.pos.y = mHitbox.pos.y; + mUnk_08c.pos.z = mHitbox.pos.z; + mUnk_08c.size = mHitbox.size; + mUnk_0a4.mUnk_04.pos.x = 0; + mUnk_0a4.mUnk_04.pos.y = FLOAT_TO_Q20(0.3); + mUnk_0a4.mUnk_04.pos.z = 0; + mUnk_0a4.mUnk_04.size = FLOAT_TO_Q20(1.3); mUnk_09c.mUnk_0 &= ~0xa4; mUnk_09c.mUnk_3 = 1; mMaxFall = mUnk_08c.size + -1; @@ -94,11 +94,11 @@ ARM void ActorRefill::vfunc_14(u32 param1) { temp_r0_2 = &mPos; Vec3p_Add(temp_r0_2, &mVel, temp_r0_2); this->func_01fffd04(0); - if (mUnk_110 || mUnk_112 || mUnk_113) { + if (mTouchingWall || mUnk_112 || mUnk_113) { mVel.x = 0; mVel.z = 0; } - if (mUnk_111) { + if (mTouchingFloor) { this->func_ov014_02135364(1); } else if (this->func_ov00_020c2c0c()) { this->func_ov014_02135364(4); |