diff options
| author | Zelllll <56516451+Zelllll@users.noreply.github.com> | 2021-02-28 21:52:12 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-28 22:52:12 -0500 |
| commit | fb1ed529ad9cfeb13158edbe716deb5aace4f272 (patch) | |
| tree | 97be08e503eefe3cb3f58338ecdaab025cd45cd6 /src/code/code_0x800CAAD0.c | |
| parent | 5c761c33f077e28b76efc74516271fd033d25cab (diff) | |
Add OoT actor structs and enums (#55)
* add oot structs
* revert formatting
* fix comment thing
* fix accidental renames
* slight fix
* naviEnemyId -> hintId
* fix headers
Diffstat (limited to 'src/code/code_0x800CAAD0.c')
| -rw-r--r-- | src/code/code_0x800CAAD0.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/code/code_0x800CAAD0.c b/src/code/code_0x800CAAD0.c index e4a9f4683..97bd8412e 100644 --- a/src/code/code_0x800CAAD0.c +++ b/src/code/code_0x800CAAD0.c @@ -38,10 +38,10 @@ void BgCheck2_UpdateActorPosition(CollisionContext* bgCtxt, s32 index, Actor* ac bgCtxt->dyna.actorMeshArr[index].currParams.pos.y, bgCtxt->dyna.actorMeshArr[index].currParams.pos.z); - Matrix_MultiplyByVectorXYZ(&prevMatrixInv, &actor->currPosRot.pos, &posWithInv); + Matrix_MultiplyByVectorXYZ(&prevMatrixInv, &actor->world.pos, &posWithInv); Matrix_MultiplyByVectorXYZ(&currMatrix, &posWithInv, &newPos); - actor->currPosRot.pos = newPos; + actor->world.pos = newPos; } void BgCheck2_UpdateActorYRotation(CollisionContext* bgCtxt, s32 index, Actor* actor) { @@ -56,7 +56,7 @@ void BgCheck2_UpdateActorYRotation(CollisionContext* bgCtxt, s32 index, Actor* a } actor->shape.rot.y += angleChange; - actor->currPosRot.rot.y += angleChange; + actor->world.rot.y += angleChange; } void BgCheck2_AttachToMesh(CollisionContext* bgCtxt, Actor* actor, s32 index) { |