diff options
| author | Yanis <35189056+Yanis002@users.noreply.github.com> | 2026-01-30 18:36:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-01-30 18:36:20 +0100 |
| commit | 98cc0af690719f10bd7b67c1c11d207bfcdbbfe7 (patch) | |
| tree | 106937a3d0b6476d44872d8ccf2cfc6b0a6a03df /src/Main/Player | |
| parent | e5701a754e910812061cdd7aa2012feca050a6c4 (diff) | |
Started `TouchControl.cpp` (#111)
* start both `TouchControl.cpp`
* fix build issues
* complete touchcontrol
* remove useless comment
---------
Co-authored-by: Yanis002 <Yanis002@users.noreply.github.com>
Diffstat (limited to 'src/Main/Player')
| -rw-r--r-- | src/Main/Player/TouchControl.cpp | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/src/Main/Player/TouchControl.cpp b/src/Main/Player/TouchControl.cpp index 0212f591..4f4c81c1 100644 --- a/src/Main/Player/TouchControl.cpp +++ b/src/Main/Player/TouchControl.cpp @@ -1,4 +1,24 @@ #include "Player/TouchControl.hpp" +#include "global.h" -bool TouchControl::func_0202b864(Vec3p *param1, s32 size, unk8 param3) {} -bool TouchControl::func_0202b894(Vec3p *param1, s32 size, unk8 param3) {} +extern "C" bool func_0202b8f8(Vec3p *, s32, s32, s32, unk8); + +ARM bool TouchControl::func_0202b864(Vec3p *param1, s32 size, unk8 param3) { + if (gTouchControl.mFlags & TouchFlag_TouchedNow) { + return func_0202b8f8(param1, size, gTouchControl.mTouchX, gTouchControl.mTouchY, param3); + } + + return false; +} + +ARM bool TouchControl::func_0202b894(Vec3p *param1, s32 size, unk8 param3) { + if (gTouchControl.mTouch) { + return func_0202b8f8(param1, size, gTouchControl.mTouchX, gTouchControl.mTouchY, param3); + } + + if (gTouchControl.mFlags & TouchFlag_UntouchedNow) { + return func_0202b8f8(param1, size, gTouchControl.mTouchPrevX, gTouchControl.mTouchPrevY, param3); + } + + return false; +} |
