Merge pull request #313 from robojumper/vec-mtx-cleanup

Cleanup

20 files changed, 52 insertions, 50 deletions

diff --git a/src/REL/d/a/d_a_bombf.cpp b/src/REL/d/a/d_a_bombf.cpp
index 5a416522..d94a76d0 100644
--- a/src/REL/d/a/d_a_bombf.cpp
+++ b/src/REL/d/a/d_a_bombf.cpp
@@ -54,7 +54,7 @@ int dAcBombf_c::actorPostCreate() {
     mMtx_c mtx;
     mtx.ZXYrotS(mRotation.x, mRotation.y, mRotation.z);
     mVec3_c v;
-    PSMTXMultVecSR(mtx, mVec3_c::Ey, v);
+    MTXMultVecSR(mtx, mVec3_c::Ey, v);
     mVec3_c v3 = mPosition + v * 10.0f;
     mVec3_c v4 = mPosition - v * 10.0f;
 
@@ -184,7 +184,7 @@ void dAcBombf_c::executeState_Wait() {
     f32 scaleFactor = mScale.x;
     if (field_0x3D2 == 0 || field_0x3D2 == 2) {
         mVec3_c up;
-        PSMTXMultVecSR(mWorldMtx, mVec3_c::Ey, up);
+        MTXMultVecSR(mWorldMtx, mVec3_c::Ey, up);
         mVec3_c upScaled = up * 30.0f;
         mVec3_c checkPos = mPosition + upScaled;
 
diff --git a/src/REL/d/a/d_a_t_wood_area.cpp b/src/REL/d/a/d_a_t_wood_area.cpp
index 23106844..9a92f9db 100644
--- a/src/REL/d/a/d_a_t_wood_area.cpp
+++ b/src/REL/d/a/d_a_t_wood_area.cpp
@@ -14,7 +14,7 @@ STATE_DEFINE(dAcTWoodArea_c, Wait);
 
 int dAcTWoodArea_c::actorCreate() {
     mStateMgr.changeState(StateID_Init);
-    PSMTXTrans(mWorldMtx.m, mPosition.x, mPosition.y, mPosition.z);
+    MTXTrans(mWorldMtx.m, mPosition.x, mPosition.y, mPosition.z);
     mBoundingBox.mMin = mVec3_c(-0.0f, -0.0f, -0.0f);
     mBoundingBox.mMax = mVec3_c(0.0f, 0.0f, 0.0f);
     return SUCCEEDED;
diff --git a/src/REL/d/a/e/d_a_e_hb_leaf.cpp b/src/REL/d/a/e/d_a_e_hb_leaf.cpp
index c1d0e291..92047ba0 100644
--- a/src/REL/d/a/e/d_a_e_hb_leaf.cpp
+++ b/src/REL/d/a/e/d_a_e_hb_leaf.cpp
@@ -75,8 +75,8 @@ int dAcEhb_leaf_c::actorExecute() {
     updateMatrix();
     if (mType != 0) {
         Mtx m;
-        PSMTXScale(m, mTimeAreaStruct.field_0x00, mTimeAreaStruct.field_0x00, mTimeAreaStruct.field_0x00);
-        PSMTXConcat(mWorldMtx.m, m, mWorldMtx.m);
+        MTXScale(m, mTimeAreaStruct.field_0x00, mTimeAreaStruct.field_0x00, mTimeAreaStruct.field_0x00);
+        MTXConcat(mWorldMtx.m, m, mWorldMtx.m);
     }
     mModel.getModel().setLocalMtx(mWorldMtx);
     mModel.getModel().calc(false);
diff --git a/src/REL/d/a/e/d_a_e_remly.cpp b/src/REL/d/a/e/d_a_e_remly.cpp
index df9c8ddc..fdf8a5a3 100644
--- a/src/REL/d/a/e/d_a_e_remly.cpp
+++ b/src/REL/d/a/e/d_a_e_remly.cpp
@@ -1148,7 +1148,7 @@ void dAcEremly_c::executeState_Fly() {
         mSomeCounter++;
         mVec3_c v(0.f, 0.f, 0.f);
 
-        v.offsetWithAngle(a, -10.f + _weird_zero);
+        getXZCirclePoint(v, a, -10.f + _weird_zero);
 
         field_0xAF8.set(v);
     }
diff --git a/src/REL/d/a/obj/d_a_obj_F400_gate_seal.cpp b/src/REL/d/a/obj/d_a_obj_F400_gate_seal.cpp
index c3ce8ad7..e3834de2 100644
--- a/src/REL/d/a/obj/d_a_obj_F400_gate_seal.cpp
+++ b/src/REL/d/a/obj/d_a_obj_F400_gate_seal.cpp
@@ -55,7 +55,7 @@ int dAcOF400GateSeal_c::actorPostCreate() {
     dAcOdoor_c *door;
 
     while (notDone && parent != nullptr) {
-        if (10000.0f < PSVECSquareDistance(mPosition, parent->mPosition)) {
+        if (10000.0f < VECSquareDistance(mPosition, parent->mPosition)) {
             parent = (dAcOdoor_c *)fManager_c::searchBaseByProfName(fProfile::OBJ_DOOR, parent);
             door = parent;
         } else {
diff --git a/src/REL/d/a/obj/d_a_obj_bird_sp.cpp b/src/REL/d/a/obj/d_a_obj_bird_sp.cpp
index 94b769bd..11d8e883 100644
--- a/src/REL/d/a/obj/d_a_obj_bird_sp.cpp
+++ b/src/REL/d/a/obj/d_a_obj_bird_sp.cpp
@@ -42,7 +42,7 @@ int dAcObjBirdSp_c::actorExecute() {
         mVec3_c posChange(0, -0.2, 1.0);
         mMtx_c matrix;
         matrix.ZXYrotS(mRotation);
-        PSMTXMultVec(matrix.m, posChange, posChange);
+        MTXMultVec(matrix.m, posChange, posChange);
 
         f32 angle = (mPosition - dBird_c::getInstance()->mPosition).dot(posChange);
         if (angle < 0.0f) {
diff --git a/src/REL/d/a/obj/d_a_obj_decoB.cpp b/src/REL/d/a/obj/d_a_obj_decoB.cpp
index 36d3e075..ba3fc3fb 100644
--- a/src/REL/d/a/obj/d_a_obj_decoB.cpp
+++ b/src/REL/d/a/obj/d_a_obj_decoB.cpp
@@ -35,7 +35,7 @@ int dAcODecoB_c::doDelete() {
 
 int dAcODecoB_c::actorExecute() {
     mStateMgr.executeState();
-    PSMTXTrans(mWorldMtx, mPosition.x, mPosition.y, mPosition.z);
+    MTXTrans(mWorldMtx, mPosition.x, mPosition.y, mPosition.z);
     mWorldMtx.ZXYrotM(mRotation);
     mMdl.setLocalMtx(mWorldMtx);
     return SUCCEEDED;
diff --git a/src/REL/d/a/obj/d_a_obj_flying_clawshot_target.cpp b/src/REL/d/a/obj/d_a_obj_flying_clawshot_target.cpp
index 3bde0aa3..d48e43f5 100644
--- a/src/REL/d/a/obj/d_a_obj_flying_clawshot_target.cpp
+++ b/src/REL/d/a/obj/d_a_obj_flying_clawshot_target.cpp
@@ -85,7 +85,7 @@ int dAcOFlyingClawshotTarget_c::actorExecute() {
     dAcPy_c *player = dAcPy_c::LINK;
 
     mVec3_c markPoint;
-    PSMTXMultVec(mWorldMtx, mMarkPoint, markPoint);
+    MTXMultVec(mWorldMtx, mMarkPoint, markPoint);
 
     f32 dist_to = markPoint.squareDistance(player->mPosition);
 
diff --git a/src/REL/d/a/obj/d_a_obj_ivy_rope.cpp b/src/REL/d/a/obj/d_a_obj_ivy_rope.cpp
index ebf95f33..b1976feb 100644
--- a/src/REL/d/a/obj/d_a_obj_ivy_rope.cpp
+++ b/src/REL/d/a/obj/d_a_obj_ivy_rope.cpp
@@ -852,7 +852,7 @@ void dAcOivyRope_c::fn_256_D3D0(mVec3_c &pOut1, mVec3_c &pOut2, s16 param2, bool
     getXZCirclePoint(somevec, swingAngle, something);
 
     mVec3_c somevec2(0.f, -25.f, float0);
-    PSMTXMultVec(m, somevec, somevec2);
+    MTXMultVec(m, somevec, somevec2);
     somevec2 += somevec;
     if (somevec2.z < float0) {
         somevec2.z = float0;
@@ -860,7 +860,7 @@ void dAcOivyRope_c::fn_256_D3D0(mVec3_c &pOut1, mVec3_c &pOut2, s16 param2, bool
 
     // name 100% guess
     mVec3_c swingTarget;
-    PSMTXMultVec(m, somevec, swingTarget);
+    MTXMultVec(m, somevec, swingTarget);
 
     cLib::addCalcPos(&pOut2, swingTarget, 0.3f, 50.f, 1.f);
 
diff --git a/src/REL/d/a/obj/d_a_obj_pool_cock.cpp b/src/REL/d/a/obj/d_a_obj_pool_cock.cpp
index c455a9bf..0c0a2d73 100644
--- a/src/REL/d/a/obj/d_a_obj_pool_cock.cpp
+++ b/src/REL/d/a/obj/d_a_obj_pool_cock.cpp
@@ -60,12 +60,12 @@ int dAcOPoolCock_c::actorExecute() {
     mMtx_c tmp2;
 
     mVec3_c translation = mOpenDirection * mOpenProgress;
-    PSMTXTrans(tmp1, translation.x, translation.y, translation.z);
-    PSMTXConcat(mdl1Transform, tmp1, mdl1Transform);
+    MTXTrans(tmp1, translation.x, translation.y, translation.z);
+    MTXConcat(mdl1Transform, tmp1, mdl1Transform);
 
     mVec3_c translation2 = -translation;
-    PSMTXTrans(tmp2, translation2.x, translation2.y, translation2.z);
-    PSMTXConcat(mdl2Transform, tmp2, mdl2Transform);
+    MTXTrans(tmp2, translation2.x, translation2.y, translation2.z);
+    MTXConcat(mdl2Transform, tmp2, mdl2Transform);
 
     mdl2Transform.YrotM(-0x8000);
     mModels[0].setLocalMtx(mdl1Transform);
diff --git a/src/REL/d/a/obj/d_a_obj_soil.cpp b/src/REL/d/a/obj/d_a_obj_soil.cpp
index 15b1dc78..5a06cbf0 100644
--- a/src/REL/d/a/obj/d_a_obj_soil.cpp
+++ b/src/REL/d/a/obj/d_a_obj_soil.cpp
@@ -11,6 +11,7 @@
 #include "d/d_camera.h"
 #include "d/d_sc_game.h"
 #include "d/d_stage_mgr.h"
+#include "d/d_vec.h"
 #include "d/flag/sceneflag_manager.h"
 #include "d/snd/d_snd_small_effect_mgr.h"
 #include "d/t/d_t_insect.h"
@@ -476,7 +477,8 @@ void dAcOsoil_c::giveItemFinal() {
 
 void dAcOsoil_c::calcItemAndInsectSpawnPos() {
     mItemAndInsectSpawnPos = mPosition;
-    mItemAndInsectSpawnPos.offsetWithAngle(dAcPy_c::LINK->getRotation().y, 30.f);
+    // TODO not sure about this s16 cast
+    getXZCirclePoint(mItemAndInsectSpawnPos, (s16)dAcPy_c::LINK->getRotation().y, 30.f);
 }
 
 void dAcOsoil_c::fn_255_1A50() {
diff --git a/src/REL/d/a/obj/d_a_obj_spike.cpp b/src/REL/d/a/obj/d_a_obj_spike.cpp
index 9cec9808..2e5be594 100644
--- a/src/REL/d/a/obj/d_a_obj_spike.cpp
+++ b/src/REL/d/a/obj/d_a_obj_spike.cpp
@@ -35,15 +35,15 @@ int dAcOspike_c::create() {
     updateMatrix();
     mMdl.setLocalMtx(mWorldMtx);
     mVec3_c tmp;
-    PSMTXMultVecSR(mWorldMtx.m, mVec3_c::Ex, tmp);
+    MTXMultVecSR(mWorldMtx.m, mVec3_c::Ex, tmp);
     mCollision.SetAtVec(tmp);
 
     mMtx_c mtx;
     mtx.XrotS(mRotation.x);
     mtx.ZrotM(mRotation.z);
     mVec3_c tmp2, tmp3;
-    PSMTXMultVecSR(mtx.m, sVec1, tmp2);
-    PSMTXMultVecSR(mtx.m, sVec2, tmp3);
+    MTXMultVecSR(mtx.m, sVec1, tmp2);
+    MTXMultVecSR(mtx.m, sVec2, tmp3);
 
     if (tmp2.x > tmp3.x) {
         f32 copy = tmp2.x;
diff --git a/src/REL/d/a/obj/d_a_obj_tower_hand_D101.cpp b/src/REL/d/a/obj/d_a_obj_tower_hand_D101.cpp
index 55d20a1d..b36f9045 100644
--- a/src/REL/d/a/obj/d_a_obj_tower_hand_D101.cpp
+++ b/src/REL/d/a/obj/d_a_obj_tower_hand_D101.cpp
@@ -176,7 +176,7 @@ int dAcOTowerHandD101_c::actorPostCreate() {
     dAcObjBase_c *ac = dAcObjBase_c::getNextObject(&dAcItem_c::sItemList, nullptr);
     f32 distLimit = 90000.0f;
     while (handClosed && ac != nullptr) {
-        if (PSVECSquareDistance(pos, ac->mPosition) < distLimit) {
+        if (VECSquareDistance(pos, ac->mPosition) < distLimit) {
             handClosed = false;
             mHeldItem.link(static_cast<dAcItem_c *>(ac));
         } else {
@@ -210,7 +210,7 @@ int dAcOTowerHandD101_c::actorExecute() {
     UNKWORD w = link->IfCurrentActionToActor(this, 0x3D);
     bool b = getItem(item);
     if (!b && item->isStateWait()) {
-        f32 dist = PSVECSquareDistance(item->mPosition, link->mPosition);
+        f32 dist = VECSquareDistance(item->mPosition, link->mPosition);
         if (w == 0 && dist < 15625.0f) {
             item->getItemFromBWheelItem();
         } else {
@@ -240,13 +240,13 @@ int dAcOTowerHandD101_c::actorExecute() {
     mMtx_c tmpMtx4;
 
     getLoc1Mtx(tmpMtx2);
-    PSMTXScale(tmpMtx1, newScale.x, newScale.y, newScale.z);
-    PSMTXConcat(tmpMtx2, tmpMtx1, tmpMtx2);
+    MTXScale(tmpMtx1, newScale.x, newScale.y, newScale.z);
+    MTXConcat(tmpMtx2, tmpMtx1, tmpMtx2);
     mLoc1Mtx.copyFrom(tmpMtx2);
 
     getLoc2Mtx(tmpMtx3);
-    PSMTXScale(tmpMtx4, newScale.x, newScale.y, newScale.z);
-    PSMTXConcat(tmpMtx3, tmpMtx4, tmpMtx3);
+    MTXScale(tmpMtx4, newScale.x, newScale.y, newScale.z);
+    MTXConcat(tmpMtx3, tmpMtx4, tmpMtx3);
     mLoc2Mtx.copyFrom(tmpMtx3);
 
     if (mEffects.hasEmitters()) {
@@ -292,13 +292,13 @@ int dAcOTowerHandD101_c::actorExecuteInEvent() {
             mMtx_c tmpMtx4;
 
             getLoc1Mtx(tmpMtx2);
-            PSMTXScale(tmpMtx1, newScale.x, newScale.y, newScale.z);
-            PSMTXConcat(tmpMtx2, tmpMtx1, tmpMtx2);
+            MTXScale(tmpMtx1, newScale.x, newScale.y, newScale.z);
+            MTXConcat(tmpMtx2, tmpMtx1, tmpMtx2);
             mLoc1Mtx.copyFrom(tmpMtx2);
 
             getLoc2Mtx(tmpMtx3);
-            PSMTXScale(tmpMtx4, newScale.x, newScale.y, newScale.z);
-            PSMTXConcat(tmpMtx3, tmpMtx4, tmpMtx3);
+            MTXScale(tmpMtx4, newScale.x, newScale.y, newScale.z);
+            MTXConcat(tmpMtx3, tmpMtx4, tmpMtx3);
             mLoc2Mtx.copyFrom(tmpMtx3);
 
             if (mEffects.hasEmitters()) {
@@ -572,7 +572,7 @@ void dAcOTowerHandD101_c::executeState_RemainOpen() {
     dAcPy_c *link = dAcPy_c::LINK;
     mVec3_c pos;
     getItemPos(pos);
-    f32 linkDistToItem = PSVECSquareDistance(pos, link->mPosition);
+    f32 linkDistToItem = VECSquareDistance(pos, link->mPosition);
     if (EventManager::isInEvent() && getEventStuff().getCurrentEventCommand() == 'wait') {
         return;
     }
@@ -604,7 +604,7 @@ void dAcOTowerHandD101_c::executeState_Close() {
     dAcPy_c *link = dAcPy_c::LINK;
     mVec3_c pos;
     getItemPos(pos);
-    f32 linkDistToItem = PSVECSquareDistance(pos, link->mPosition);
+    f32 linkDistToItem = VECSquareDistance(pos, link->mPosition);
     if (EventManager::isInEvent() && getEventStuff().getCurrentEventCommand() == 'wait') {
         mStateMgr.changeState(StateID_Open);
         return;
@@ -656,7 +656,7 @@ void dAcOTowerHandD101_c::executeState_Open() {
     dAcPy_c *link = dAcPy_c::LINK;
     mVec3_c pos;
     getItemPos(pos);
-    f32 linkDistToItem = PSVECSquareDistance(pos, link->mPosition);
+    f32 linkDistToItem = VECSquareDistance(pos, link->mPosition);
     if (EventManager::isInEvent() && getEventStuff().getCurrentEventCommand() == 'wait') {
         if (mMdl.getAnm().isStop()) {
             mStateMgr.changeState(StateID_RemainOpen);
@@ -714,7 +714,7 @@ void dAcOTowerHandD101_c::executeState_RemainClosed() {
     dAcPy_c *link = dAcPy_c::LINK;
     mVec3_c pos;
     getItemPos(pos);
-    f32 linkDistToItem = PSVECSquareDistance(pos, link->mPosition);
+    f32 linkDistToItem = VECSquareDistance(pos, link->mPosition);
     if (EventManager::isInEvent() && getEventStuff().getCurrentEventCommand() == 'wait') {
         mStateMgr.changeState(StateID_Open);
         return;
diff --git a/src/REL/d/a/obj/d_a_obj_triforce.cpp b/src/REL/d/a/obj/d_a_obj_triforce.cpp
index 4c17ba02..d8b1045f 100644
--- a/src/REL/d/a/obj/d_a_obj_triforce.cpp
+++ b/src/REL/d/a/obj/d_a_obj_triforce.cpp
@@ -67,8 +67,8 @@ int dAcOtriforce_c::actorExecute() {
     dCcS::GetInstance()->Set(&mCollision);
     updateMatrix();
     Mtx m;
-    PSMTXScale(m, mScale.x, mScale.y, mScale.z);
-    PSMTXConcat(mWorldMtx.m, m, mWorldMtx.m);
+    MTXScale(m, mScale.x, mScale.y, mScale.z);
+    MTXConcat(mWorldMtx.m, m, mWorldMtx.m);
     mMdl.setLocalMtx(mWorldMtx);
     mAnm.play();
     mEffects.holdEffect(PARTICLE_RESOURCE_ID_MAPPING_967_, mWorldMtx, nullptr, nullptr);
diff --git a/src/REL/d/a/obj/d_a_obj_tubo.cpp b/src/REL/d/a/obj/d_a_obj_tubo.cpp
index 68e71f1e..c5efcdf1 100644
--- a/src/REL/d/a/obj/d_a_obj_tubo.cpp
+++ b/src/REL/d/a/obj/d_a_obj_tubo.cpp
@@ -681,7 +681,7 @@ mVec3_c dAcOtubo_c::getCenter() const {
     mMtx_c m;
     m.ZXYrotS(mRotation.x, mRotation.y, mRotation.z);
     mVec3_c dir;
-    PSMTXMultVecSR(m, mVec3_c::Ey, dir);
+    MTXMultVecSR(m, mVec3_c::Ey, dir);
 
     return mPosition + dir * 28.f;
 }
diff --git a/src/REL/d/a/obj/d_a_obj_tumble_weed.cpp b/src/REL/d/a/obj/d_a_obj_tumble_weed.cpp
index 8e319c59..bbe61c61 100644
--- a/src/REL/d/a/obj/d_a_obj_tumble_weed.cpp
+++ b/src/REL/d/a/obj/d_a_obj_tumble_weed.cpp
@@ -385,7 +385,7 @@ mVec3_c dAcOTumbleWeed_c::getTumblePosition() const {
     mMtx_c mtx;
     mVec3_c vec;
     mtx.ZXYrotS(mRotation.x, mRotation.y, mRotation.z);
-    PSMTXMultVecSR(mtx, mVec3_c::Ey, vec);
+    MTXMultVecSR(mtx, mVec3_c::Ey, vec);
     return mPosition + vec * 40.f;
 }
 
diff --git a/src/REL/d/t/d_t_col_bomb_shield.cpp b/src/REL/d/t/d_t_col_bomb_shield.cpp
index ed9fa5bf..d4598712 100644
--- a/src/REL/d/t/d_t_col_bomb_shield.cpp
+++ b/src/REL/d/t/d_t_col_bomb_shield.cpp
@@ -25,7 +25,7 @@ int dTgColBombShield::create() {
     mColMtx.transS(mPosition.x, mPosition.y + mScale.y * 0.5f - 0.05f, mPosition.z);
     mColMtx.ZXYrotM(mRotation.x, mRotation.y, mRotation.z);
     mMtx_c tmp;
-    PSMTXScale(tmp, mScale.x, mScale.y, mScale.z);
+    MTXScale(tmp, mScale.x, mScale.y, mScale.z);
     mColMtx += tmp;
     mStateMgr.changeState(StateID_Wait);
     return SUCCEEDED;
diff --git a/src/REL/d/t/d_t_insect.cpp b/src/REL/d/t/d_t_insect.cpp
index 125387f8..8f5b5e4e 100644
--- a/src/REL/d/t/d_t_insect.cpp
+++ b/src/REL/d/t/d_t_insect.cpp
@@ -187,10 +187,10 @@ void dTgInsect_c::executeState_Wait() {
                     mInsectRespawnTimers[i]--;
                 } else if (mInsectRespawnTimers[i] == 0) {
                     nw4r::math::MTX34 mtx;
-                    PSMTXTrans(mtx, mPosition.x, mPosition.y, mPosition.z);
+                    MTXTrans(mtx, mPosition.x, mPosition.y, mPosition.z);
                     nw4r::math::MTX34 scale;
-                    PSMTXScale(scale, mScale.x, mScale.y, mScale.x);
-                    PSMTXConcat(mtx, scale, mtx);
+                    MTXScale(scale, mScale.x, mScale.y, mScale.x);
+                    MTXConcat(mtx, scale, mtx);
                     nw4r::math::AABB aabb(-100, 0, -100, 100, 100, 100);
                     aabb.Set(&aabb, &mtx);
                     if (fn_801BB750(&aabb, 10000)) {
diff --git a/src/REL/d/t/d_t_noeffect_area.cpp b/src/REL/d/t/d_t_noeffect_area.cpp
index 35230f7e..dce92248 100644
--- a/src/REL/d/t/d_t_noeffect_area.cpp
+++ b/src/REL/d/t/d_t_noeffect_area.cpp
@@ -9,9 +9,9 @@ const f32 dTgNoEffectArea_c::sFloat2 = 100.0f;
 
 int dTgNoEffectArea_c::create() {
     mScale *= 0.01f;
-    PSMTXTrans(mMtx, mPosition.x, mPosition.y, mPosition.z);
+    MTXTrans(mMtx, mPosition.x, mPosition.y, mPosition.z);
     mMtx.YrotM(mRotation.y);
-    PSMTXInverse(mMtx, mMtx);
+    MTXInverse(mMtx, mMtx);
     addToList(sList);
     return SUCCEEDED;
 }
diff --git a/src/REL/d/t/d_t_sound_area.cpp b/src/REL/d/t/d_t_sound_area.cpp
index d1bd6161..59bf2db0 100644
--- a/src/REL/d/t/d_t_sound_area.cpp
+++ b/src/REL/d/t/d_t_sound_area.cpp
@@ -23,9 +23,9 @@ int dTgSndAr_c::create() {
 
     switch (getTypeFromParams()) {
         case 0:
-            PSMTXTrans(mtx.m, mPosition.x, mPosition.y, mPosition.z);
+            MTXTrans(mtx.m, mPosition.x, mPosition.y, mPosition.z);
             mtx.YrotM(mRotation.y);
-            PSMTXInverse(mtx.m, mtx.m);
+            MTXInverse(mtx.m, mtx.m);
             break;
         case 3: mRail.initWithPathIndex(mParams >> 8 & 0xFF, mRoomID, 0); break;
     }
@@ -83,7 +83,7 @@ inline bool inRange(f32 val, f32 tolerance) {
 // Box
 bool dTgSndAr_c::checkAlg0(const mVec3_c &pos) {
     mVec3_c c2 = pos;
-    PSMTXMultVec(mtx.m, c2, c2);
+    MTXMultVec(mtx.m, c2, c2);
     f32 sxLower = -50.0f * mScale.x;
     f32 sxUpper = 50.0f * mScale.x;
     f32 syLower = 0.0f;
@@ -102,7 +102,7 @@ bool dTgSndAr_c::checkAlg0(const mVec3_c &pos) {
 bool dTgSndAr_c::checkAlg1(const mVec3_c &pos) {
     f32 tgtDist = mScale.x * 100.0f;
     f32 tgtDist2 = tgtDist * tgtDist;
-    return PSVECSquareDistance(mPosition, pos) < tgtDist2;
+    return VECSquareDistance(mPosition, pos) < tgtDist2;
 }
 
 // Cylinder
@@ -152,11 +152,11 @@ bool dTgSndAr_c::checkAlg3(const mVec3_c &pos) {
         return d < radius;
     } else {
         // Otherwise check if we are within the spheres around the endpoints
-        f32 distSq = PSVECSquareDistance(unk.GetStart(), pos);
+        f32 distSq = VECSquareDistance(unk.GetStart(), pos);
         if (distSq < radius) {
             return true;
         } else {
-            distSq = PSVECSquareDistance(unk.GetEnd(), pos);
+            distSq = VECSquareDistance(unk.GetEnd(), pos);
             return distSq < radius;
         }
     }