diff options
| author | Yanis42 <35189056+Yanis42@users.noreply.github.com> | 2024-04-16 00:58:58 +0200 |
|---|---|---|
| committer | Yanis42 <35189056+Yanis42@users.noreply.github.com> | 2024-04-16 00:58:58 +0200 |
| commit | 2577871c94a173768503c15eade891269acdd348 (patch) | |
| tree | 3d327ffc73c6bba32e5308b4218ce1b0a67a81e0 /src/14_Land/Actor/ActorRupee.cpp | |
| parent | 40e593461fd7c0005f33b13cc6b297f4cba1ef74 (diff) | |
improved vfunc_20 a bit
Diffstat (limited to 'src/14_Land/Actor/ActorRupee.cpp')
| -rw-r--r-- | src/14_Land/Actor/ActorRupee.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/14_Land/Actor/ActorRupee.cpp b/src/14_Land/Actor/ActorRupee.cpp index 0fb129d7..60fac224 100644 --- a/src/14_Land/Actor/ActorRupee.cpp +++ b/src/14_Land/Actor/ActorRupee.cpp @@ -355,15 +355,10 @@ void ActorRupee::vfunc_18(bool param1) { func_ov00_0207a1c8(&mUnk_0a4.mUnk_00, param1, &mPos); } +#define VFUNC20_COND (param1 ? mUnk_0a4.mUnk_01 : mUnk_0a4.mUnk_00) void ActorRupee::vfunc_20(bool param1) { - if (param1 ? mUnk_0a4.mUnk_01 : mUnk_0a4.mUnk_00) { - if (mUnk_130 == 2 && mActiveFrames % 8 < 4) { - return; - } - - if (param1 ? mUnk_0a4.mUnk_01 : mUnk_0a4.mUnk_00) { - func_ov14_0213b5f4(mRupeeId, param1, &mPos, true); - } + if (VFUNC20_COND && !(mUnk_130 == 2 && mActiveFrames % 8 < 4) && VFUNC20_COND) { + func_ov14_0213b5f4(mRupeeId, param1, &mPos, true); } } |