diff options
Diffstat (limited to 'src/00_Core/Actor')
| -rw-r--r-- | src/00_Core/Actor/Actor.cpp | 16 | ||||
| -rw-r--r-- | src/00_Core/Actor/ActorSpawner.cpp | 10 | ||||
| -rw-r--r-- | src/00_Core/Actor/Dungeon/ActorEventIcon.cpp | 13 | ||||
| -rw-r--r-- | src/00_Core/Actor/Dungeon/ActorSwitchObject.cpp | 15 | ||||
| -rw-r--r-- | src/00_Core/Actor/Navi/ActorNaviBase.cpp | 46 |
5 files changed, 92 insertions, 8 deletions
diff --git a/src/00_Core/Actor/Actor.cpp b/src/00_Core/Actor/Actor.cpp index 2508b381..e12b246d 100644 --- a/src/00_Core/Actor/Actor.cpp +++ b/src/00_Core/Actor/Actor.cpp @@ -252,7 +252,7 @@ ARM bool Actor::vfunc_9c() {} ARM bool Actor::func_ov00_020c195c() { if (!mUnk_11b) return false; - gPlayerLink->func_ov00_020bc854(&mPos); + gPlayerLink->func_ov000_020bc854(&mPos); return true; } @@ -266,7 +266,7 @@ ARM bool Actor::func_ov00_020c198c() { { return false; } - if (gPlayerLink && !gPlayerLink->func_ov00_020bd304()) return false; + if (gPlayerLink && !gPlayerLink->func_ov000_020bd304()) return false; return true; } @@ -545,12 +545,12 @@ ARM bool Actor::func_ov00_020c243c(ActorTypeId *actorTypes, Actor **out) { knockback.mUnk_10 = 5; } break; - case ActorTypeId_ROPE: { + case ActorTypeId_GrapplingHook: { knockback.mUnk_10 = 8; } break; case ActorTypeId_Bomb: - case ActorTypeId_BLST: + case ActorTypeId_Blast: case ActorTypeId_BMTY: case ActorTypeId_CBLS: { knockback.mUnk_10 = 6; @@ -753,7 +753,7 @@ ARM EquipBoomerang *Actor::GetEquipBoomerang() { ARM bool Actor::func_ov00_020c2d54() { const ActorTypeId types[] = { - ActorTypeId_ROPE, + ActorTypeId_GrapplingHook, ActorTypeId_Null, }; if (mHitbox.size >= 0) { @@ -774,7 +774,7 @@ ARM bool Actor::func_ov00_020c2de4() { EquipRope *rope = EquipSword::GetEquipRope(); - Actor *actor = rope->func_ov14_0213d420(); + ActorRope *actor = rope->GetRopeActor(); if (actor) { Vec3p_Sub(&actor->mPos, &mPos, &vel); if (Vec3p_Length(&vel) > FLOAT_TO_Q20(1.0)) { @@ -813,8 +813,8 @@ ARM bool Actor::func_ov00_020c2ed4() { s32 index = rope->func_ov14_0213d440(mRef.id); if (index >= 0) { - bool unk1 = rope->func_ov14_0213d420(); - if (unk1) { + ActorRope *actor = rope->GetRopeActor(); + if (actor) { Vec3p vel; if (rope->func_ov14_0213d81c(index, &vel)) { mVel = vel; diff --git a/src/00_Core/Actor/ActorSpawner.cpp b/src/00_Core/Actor/ActorSpawner.cpp new file mode 100644 index 00000000..514156ac --- /dev/null +++ b/src/00_Core/Actor/ActorSpawner.cpp @@ -0,0 +1,10 @@ +#include "Actor/ActorSpawner.hpp" + +ActorSpawner *ActorSpawner::Create() {} +void ActorSpawner::Destroy() {} +ActorSpawner::ActorSpawner() {} +ActorSpawner::~ActorSpawner() {} +void ActorSpawner::_ZN12ActorSpawner19func_ov000_020c4014Ev() {} +void ActorSpawner::_ZN12ActorSpawner19func_ov000_020c4018Ev() {} +Actor *ActorSpawner::CreateActor(ActorTypeId type) {} +s32 ActorSpawner::Spawn(ActorTypeId type, Vec3p *pos, void *param3, ActorRef *ref) {} diff --git a/src/00_Core/Actor/Dungeon/ActorEventIcon.cpp b/src/00_Core/Actor/Dungeon/ActorEventIcon.cpp new file mode 100644 index 00000000..8e943095 --- /dev/null +++ b/src/00_Core/Actor/Dungeon/ActorEventIcon.cpp @@ -0,0 +1,13 @@ +#include "Actor/Dungeon/ActorEventIcon.hpp" + +ActorType ActorEventIcon::gType = ActorType(ActorTypeId_EventIcon, (ActorCreateFunc) ActorEventIcon::Create, NULL); + +ActorEventIcon *ActorEventIcon::Create() {} +ActorEventIcon::ActorEventIcon() {} +bool ActorEventIcon::vfunc_08() {} +void ActorEventIcon::vfunc_14(u32 param1) {} +void ActorEventIcon::vfunc_18(u32 param1) {} +u32 ActorEventIcon::func_ov000_02090648(u32 param1) {} +bool func_ov000_02090774(u32 param1) {} +void ActorEventIcon::vfunc_1c(u16 *param1) {} +ActorEventIcon::~ActorEventIcon() {} diff --git a/src/00_Core/Actor/Dungeon/ActorSwitchObject.cpp b/src/00_Core/Actor/Dungeon/ActorSwitchObject.cpp new file mode 100644 index 00000000..37c4511c --- /dev/null +++ b/src/00_Core/Actor/Dungeon/ActorSwitchObject.cpp @@ -0,0 +1,15 @@ +#include "Actor/Dungeon/ActorSwitchObject.hpp" + +ActorType ActorSwitchObject::gType = ActorType(ActorTypeId_SwitchObject, (ActorCreateFunc) ActorSwitchObject::Create, NULL); + +ActorSwitchObject *ActorSwitchObject::Create() {} +bool ActorSwitchObject::vfunc_08() {} +void ActorSwitchObject::vfunc_0c() {} +void ActorSwitchObject::vfunc_14(u32 param1) {} +void ActorSwitchObject::vfunc_18(u32 param1) {} +bool ActorSwitchObject::func_ov000_0208fc10(s32 param1) {} +void ActorSwitchObject::func_ov000_0208fc7c() {} +bool ActorSwitchObject::func_ov000_0208fcb4() {} +void ActorSwitchObject::func_ov000_0208fef8() {} +void ActorSwitchObject::func_ov000_0209032c() {} +ActorSwitchObject::~ActorSwitchObject() {} diff --git a/src/00_Core/Actor/Navi/ActorNaviBase.cpp b/src/00_Core/Actor/Navi/ActorNaviBase.cpp new file mode 100644 index 00000000..677d677b --- /dev/null +++ b/src/00_Core/Actor/Navi/ActorNaviBase.cpp @@ -0,0 +1,46 @@ +#include "Actor/Navi/ActorNaviBase.hpp" + +void ActorNaviBase::vfunc_c4() {} +void ActorNaviBase::vfunc_c8() {} +unk32 ActorNaviBase::vfunc_30() {} +s32 ActorNaviBase::vfunc_b8() {} +bool ActorNaviBase::vfunc_cc(unk32 *param1) {} +void ActorNaviBase::GetOffsetPos(Vec3p *pos) {} +unk32 ActorNaviBase::vfunc_38() {} +void ActorNaviBase::vfunc_d0() {} +void ActorNaviBase::func_ov000_020b8c50() {} +void ActorNaviBase::func_ov000_020b8c98(unk32 param1, unk32 param2, unk32 param3) {} +void ActorNaviBase::vfunc_d4() {} +void ActorNaviBase::vfunc_d8() {} +void ActorNaviBase::SetActive(bool active) {} +void ActorNaviBase::TeleportAboveLink() {} +void ActorNaviBase::vfunc_e0() {} +void ActorNaviBase::vfunc_e4() {} +void ActorNaviBase::func_ov000_020b9770(s32 param1) {} +void ActorNaviBase::vfunc_e8() {} +void ActorNaviBase::vfunc_14(u32 param1) {} +void ActorNaviBase::vfunc_18(u32 param1) {} +void ActorNaviBase::func_ov000_020b9fdc() {} +void ActorNaviBase::func_ov000_020b9fe8() {} +void ActorNaviBase::vfunc_20(bool param1) {} +void ActorNaviBase::vfunc_10(u32 param1) {} +unk32 ActorNaviBase::func_ov000_020ba204(Vec3p *param1, Vec3p *param2, s32 param3) {} +unk32 func_ov000_020ba350(unk32 param1) {} +bool ActorNaviBase::vfunc_c0(Vec3p *param1) {} +unk32 ActorNaviBase::func_ov000_020ba3b4() {} +void ActorNaviBase::func_ov000_020ba414(Vec3p *param1) {} +bool ActorNaviBase::func_ov000_020ba458() {} +void ActorNaviBase::func_ov000_020ba4e4() {} +void ActorNaviBase::func_ov000_020ba53c() {} +void ActorNaviBase::vfunc_80() {} +void ActorNaviBase::vfunc_84() {} +bool ActorNaviBase::vfunc_78() {} +bool ActorNaviBase::vfunc_bc(unk32 param1, unk8 param2, s32 param3) {} +void ActorNaviBase::vfunc_74() {} +void ActorNaviBase::func_ov000_020baca8(Vec3p *param1, unk32 param2) {} +void ActorNaviBase::func_ov000_020bad18() {} +bool ActorNaviBase::vfunc_90() {} +void ActorNaviBase::vfunc_94() {} +void ActorNaviBase::func_ov000_020bb0ac() {} +void ActorNaviBase::func_ov000_020bb0e0() {} +void ActorNaviBase::vfunc_ec() {} |
