summaryrefslogtreecommitdiff
path: root/src/00_Core/Actor
diff options
context:
space:
mode:
authorAetias <144526980+AetiasHax@users.noreply.github.com>2025-11-16 17:14:48 +0100
committerGitHub <noreply@github.com>2025-11-16 17:14:48 +0100
commitfc691f4c8f76d11d6b47149fefadaca4470ab2a1 (patch)
treefe987a191d96ca71ce32776be09a57408f491050 /src/00_Core/Actor
parent5b15874c4d2d7c185c98f2791cf8fa6a9d86a440 (diff)
LinkStateInteract (#135)
* Map symbol in Game * LinkStateInteract 19% * DebugHierarchy -> Bhio * LinkStateInteract 89% * LinkStateInteract 93% * Japanese strings * Fix build * Fix regression * Fix regressions * Rename BhioBase.cpp
Diffstat (limited to 'src/00_Core/Actor')
-rw-r--r--src/00_Core/Actor/Actor.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/00_Core/Actor/Actor.cpp b/src/00_Core/Actor/Actor.cpp
index efe35900..32915a89 100644
--- a/src/00_Core/Actor/Actor.cpp
+++ b/src/00_Core/Actor/Actor.cpp
@@ -604,8 +604,8 @@ ARM bool Actor::func_ov00_020c243c(ActorTypeId *actorTypes, Actor **out) {
case ActorTypeId_BTRF:
case ActorTypeId_STNE:
case ActorTypeId_TARU:
- case ActorTypeId_BKEY:
- case ActorTypeId_FORC:
+ case ActorTypeId_BossKey:
+ case ActorTypeId_ForceGem:
case ActorTypeId_FLTB:
case ActorTypeId_TSUB:
knockback.mUnk_10 = 10;
@@ -748,8 +748,8 @@ ARM void Actor::GetHitbox(Cylinder *hitbox) {
hitbox->pos.z = mPos.z;
hitbox->pos.y += mHitbox.pos.y;
- q20 sin = gSinCosTable[angle];
- q20 cos = gSinCosTable[angle + 1];
+ q20 sin = FX_SinCosTable_[angle];
+ q20 cos = FX_SinCosTable_[angle + 1];
Vec3p_Rotate(&mHitbox.pos, sin, cos, &hitbox->pos);
}
@@ -761,8 +761,8 @@ ARM void Actor::GetUnk_08c(Cylinder *param1) {
param1->pos.z = mPos.z;
param1->pos.y += mUnk_08c.pos.y;
- q20 sin = gSinCosTable[angle];
- q20 cos = gSinCosTable[angle + 1];
+ q20 sin = FX_SinCosTable_[angle];
+ q20 cos = FX_SinCosTable_[angle + 1];
Vec3p_Rotate(&mUnk_08c.pos, sin, cos, &param1->pos);
}