3 files changed, 6 insertions, 8 deletions
diff --git a/src/toBeSorted/attention.cpp b/src/toBeSorted/attention.cpp
index 28f5290a..da5a253a 100644
--- a/src/toBeSorted/attention.cpp
+++ b/src/toBeSorted/attention.cpp
@@ -250,7 +250,7 @@ bool AttentionManager::playTargetAnim(s32 idx) {
         dAcObjBase_c *actor = pool->getActor(mModels.mCurrentTargetInfoIdx);
         mMtx_c mtx;
         mVec3_c v = pool->mInfos[mModels.mCurrentTargetInfoIdx].field_0x08;
-        PSMTXTrans(mtx, v.x, v.y, v.z);
+        MTXTrans(mtx, v.x, v.y, v.z);
 
         mModels.mMdls->mMdl.setLocalMtx(mtx);
         mModels.mMdls->mMdl.setScale(sHio.field_0x14, sHio.field_0x14, sHio.field_0x14);
diff --git a/src/toBeSorted/d_emitter.cpp b/src/toBeSorted/d_emitter.cpp
index 10e25851..1562a595 100644
--- a/src/toBeSorted/d_emitter.cpp
+++ b/src/toBeSorted/d_emitter.cpp
@@ -117,7 +117,6 @@ dEmitterBase_c::~dEmitterBase_c() {
 }
 
 JPABaseEmitter *dEmitterBase_c::GetNextEmitter(JPABaseEmitter *head) {
-    // Portability hazard: u32->pointer cast
     return reinterpret_cast<JPABaseEmitter *>(head->getUserWork());
 }
 
@@ -134,8 +133,7 @@ bool dEmitterBase_c::createEmitters(
         );
         if (last != nullptr) {
             if (head != nullptr) {
-                // Portability hazard: pointer->u32 cast
-                head->setUserWork(reinterpret_cast<u32>(last));
+                head->setUserWork(reinterpret_cast<uintptr_t>(last));
             } else {
                 mpEmitterHead = last;
             }
diff --git a/src/toBeSorted/dowsing_target.cpp b/src/toBeSorted/dowsing_target.cpp
index 35311efb..fa71ee12 100644
--- a/src/toBeSorted/dowsing_target.cpp
+++ b/src/toBeSorted/dowsing_target.cpp
@@ -50,11 +50,11 @@ void DowsingTarget::reinitialize(DowsingSlot type) {
 void DowsingTarget::getPosition(mVec3_c &position) {
     mMtx_c mtx;
     mMtx_c mtx2;
-    PSMTXTrans(mtx.m, mpActor->mPosition.x, mpActor->mPosition.y, mpActor->mPosition.z);
+    MTXTrans(mtx.m, mpActor->mPosition.x, mpActor->mPosition.y, mpActor->mPosition.z);
     mtx.YrotM(mpActor->mRotation.y);
-    PSMTXScale(mtx2.m, mpActor->mScale.x, mpActor->mScale.y, mpActor->mScale.z);
-    PSMTXConcat(mtx.m, mtx2.m, mtx.m);
-    PSMTXMultVec(mtx.m, mOffset, position);
+    MTXScale(mtx2.m, mpActor->mScale.x, mpActor->mScale.y, mpActor->mScale.z);
+    MTXConcat(mtx.m, mtx2.m, mtx.m);
+    MTXMultVec(mtx.m, mOffset, position);
 }
 
 bool DowsingTarget::hasZeldaDowsing() {