diff options
Diffstat (limited to 'src/14_Land/Actor')
| -rw-r--r-- | src/14_Land/Actor/ActorRupee.cpp | 59 | ||||
| -rw-r--r-- | src/14_Land/Actor/Player/ActorRefill.cpp | 58 |
2 files changed, 84 insertions, 33 deletions
diff --git a/src/14_Land/Actor/ActorRupee.cpp b/src/14_Land/Actor/ActorRupee.cpp index 23ac82dc..eac0b559 100644 --- a/src/14_Land/Actor/ActorRupee.cpp +++ b/src/14_Land/Actor/ActorRupee.cpp @@ -86,7 +86,9 @@ bool ActorRupee::Init() { mVel.z = 0; func_ov14_0213b204(0); break; - case 3: func_ov14_0213b204(5); break; + case 3: + func_ov14_0213b204(5); + break; } } @@ -122,23 +124,32 @@ void ActorRupee::Move() { ItemId ActorRupee::GetRupeeCutsceneItemId() { switch (mRupeeId) { - case RupeeId_Green: return ItemId_None; + case RupeeId_Green: + return ItemId_None; - case RupeeId_Blue: return ItemId_None; + case RupeeId_Blue: + return ItemId_None; - case RupeeId_Red: return ItemId_None; + case RupeeId_Red: + return ItemId_None; - case RupeeId_BigGreen: return ItemId_BigGreenRupee; + case RupeeId_BigGreen: + return ItemId_BigGreenRupee; - case RupeeId_BigRed: return ItemId_BigRedRupee; + case RupeeId_BigRed: + return ItemId_BigRedRupee; - case RupeeId_Gold: return ItemId_GoldRupee; + case RupeeId_Gold: + return ItemId_GoldRupee; - case RupeeId_Rupoor10: return ItemId_Rupoor10; + case RupeeId_Rupoor10: + return ItemId_Rupoor10; - case RupeeId_Rupoor50: return ItemId_Rupoor50; + case RupeeId_Rupoor50: + return ItemId_Rupoor50; - default: break; + default: + break; } return ItemId_None; @@ -146,7 +157,9 @@ ItemId ActorRupee::GetRupeeCutsceneItemId() { void ActorRupee::func_ov14_0213b204(unk32 param1) { switch (param1) { - case 0: mVisible = true; break; + case 0: + mVisible = true; + break; case 1: case 2: case 3: @@ -188,10 +201,17 @@ void ActorRupee::Update(bool param1) { uVar3 = -1; switch (mRupeeId) { - case RupeeId_Green: uVar3 = 0xfa; break; - case RupeeId_Blue: uVar3 = 0xfb; break; - case RupeeId_Red: uVar3 = 0xfc; break; - default: break; + case RupeeId_Green: + uVar3 = 0xfa; + break; + case RupeeId_Blue: + uVar3 = 0xfb; + break; + case RupeeId_Red: + uVar3 = 0xfc; + break; + default: + break; } func_ov000_020d7ad4(data_ov000_020eec9c, uVar3); @@ -252,7 +272,8 @@ void ActorRupee::Update(bool param1) { func_ov14_0213b204(1); } break; - default: break; + default: + break; } KillInBounds(); @@ -323,9 +344,11 @@ bool ActorRupee::func_ov14_0213b70c(RupeeId id) { case RupeeId_BigGreen: case RupeeId_BigRed: case RupeeId_Gold: - case RupeeId_Rupoor50: return true; + case RupeeId_Rupoor50: + return true; - default: break; + default: + break; } return false; diff --git a/src/14_Land/Actor/Player/ActorRefill.cpp b/src/14_Land/Actor/Player/ActorRefill.cpp index 91efd351..e547c4ed 100644 --- a/src/14_Land/Actor/Player/ActorRefill.cpp +++ b/src/14_Land/Actor/Player/ActorRefill.cpp @@ -123,7 +123,8 @@ ARM void ActorRefill::vfunc_14(u32 param1) { temp_r0_3 = mUnk_130; switch (temp_r0_3) { case 0: - case 3: break; + case 3: + break; case 1: if (this->func_ov00_020c2c0c()) { this->func_ov014_02135364(4); @@ -172,13 +173,16 @@ ARM bool ActorRefill::func_ov014_02135364(unk32 param1) { mActiveFrames = 0; switch (mUnk_130) { case 0: - case 2: break; + case 2: + break; case 1: mVel.x = 0; mVel.y = 0; mVel.z = 0; break; - case 3: this->Kill(); break; + case 3: + this->Kill(); + break; } return true; } @@ -268,9 +272,15 @@ ARM bool ActorRefillTime::Init() { return false; } switch (mUnk_020.mUnk_00[0]) { - case 2: mUnk_158 = 5; break; - case 4: mUnk_158 = 15; break; - case 5: mUnk_158 = 30; break; + case 2: + mUnk_158 = 5; + break; + case 4: + mUnk_158 = 15; + break; + case 5: + mUnk_158 = 30; + break; default: case 0: case 1: @@ -286,9 +296,15 @@ ARM bool ActorRefillTime::Init() { break; } switch (mUnk_158) { - case 15: mUnk_15c = 0x45; break; - case 30: mUnk_15c = 0x46; break; - default: mUnk_15c = 0x44; break; + case 15: + mUnk_15c = 0x45; + break; + case 30: + mUnk_15c = 0x46; + break; + default: + mUnk_15c = 0x44; + break; } return true; } @@ -310,9 +326,15 @@ ARM bool ActorLSTM::Init() { return false; } switch (mUnk_020.mUnk_00[0]) { - case 2: mUnk_158 = -5; break; - case 4: mUnk_158 = -15; break; - case 5: mUnk_158 = -30; break; + case 2: + mUnk_158 = -5; + break; + case 4: + mUnk_158 = -15; + break; + case 5: + mUnk_158 = -30; + break; default: case 0: case 1: @@ -328,9 +350,15 @@ ARM bool ActorLSTM::Init() { break; } switch (mUnk_158) { - case -15: mUnk_15c = 0x48; break; - case -30: mUnk_15c = 0x49; break; - default: mUnk_15c = 0x47; break; + case -15: + mUnk_15c = 0x48; + break; + case -30: + mUnk_15c = 0x49; + break; + default: + mUnk_15c = 0x47; + break; } return true; } |