summaryrefslogtreecommitdiff
path: root/src/00_Core/Actor/Actor.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/00_Core/Actor/Actor.cpp')
-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);
}