diff options
| author | mike8699 <mikebuntu68@gmail.com> | 2025-04-28 23:32:20 -0400 |
|---|---|---|
| committer | mike8699 <mikebuntu68@gmail.com> | 2025-05-31 19:36:20 -0400 |
| commit | 0893ad86f2204eb5c45146f3798437154c39ac66 (patch) | |
| tree | 08d54bce968aed6249d09df6a14b4354a9b53b24 /src/00_Core/Actor | |
| parent | a65e5547da4894b8d9aceaee2a81dbebd671ae3e (diff) | |
Decompile `ActorSwitchObject` `vfunc_08` and `vfunc_0c`
Diffstat (limited to 'src/00_Core/Actor')
| -rw-r--r-- | src/00_Core/Actor/Actor.cpp | 2 | ||||
| -rw-r--r-- | src/00_Core/Actor/Dungeon/ActorSwitchObject.cpp | 14 |
2 files changed, 13 insertions, 3 deletions
diff --git a/src/00_Core/Actor/Actor.cpp b/src/00_Core/Actor/Actor.cpp index db721414..123b2abe 100644 --- a/src/00_Core/Actor/Actor.cpp +++ b/src/00_Core/Actor/Actor.cpp @@ -117,7 +117,7 @@ ARM bool Actor::vfunc_08() { return true; } -ARM void Actor::vfunc_0c() {} +ARM bool Actor::vfunc_0c() {} ARM void Actor::vfunc_10(u32 param1) {} ARM void Actor::vfunc_24() {} ARM void Actor::vfunc_28() {} diff --git a/src/00_Core/Actor/Dungeon/ActorSwitchObject.cpp b/src/00_Core/Actor/Dungeon/ActorSwitchObject.cpp index 37c4511c..05b9790a 100644 --- a/src/00_Core/Actor/Dungeon/ActorSwitchObject.cpp +++ b/src/00_Core/Actor/Dungeon/ActorSwitchObject.cpp @@ -3,8 +3,18 @@ ActorType ActorSwitchObject::gType = ActorType(ActorTypeId_SwitchObject, (ActorCreateFunc) ActorSwitchObject::Create, NULL); ActorSwitchObject *ActorSwitchObject::Create() {} -bool ActorSwitchObject::vfunc_08() {} -void ActorSwitchObject::vfunc_0c() {} + +bool ActorSwitchObject::vfunc_08() { + Actor::vfunc_08(); + this->func_ov000_0208fc7c(); + this->mUnk_130 = 0; + return true; +} + +bool ActorSwitchObject::vfunc_0c() { + return this->func_ov00_020c1bfc(0) ? this->func_ov000_0208fc10(1) : this->func_ov000_0208fc10(0); +} + void ActorSwitchObject::vfunc_14(u32 param1) {} void ActorSwitchObject::vfunc_18(u32 param1) {} bool ActorSwitchObject::func_ov000_0208fc10(s32 param1) {} |
