From d00f748c31fe4aa5879e0303c1070058a2ce85b0 Mon Sep 17 00:00:00 2001
From: robojumper <robojumper@gmail.com>
Date: Sat, 10 May 2025 21:33:40 +0200
Subject: [PATCH] Revert copyFrom change for now

---
 include/egg/math/eggMatrix.h         | 2 +-
 src/d/a/d_a_insect.cpp               | 2 +-
 src/toBeSorted/d_unk_mdl_stuff_2.cpp | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/egg/math/eggMatrix.h b/include/egg/math/eggMatrix.h
index 90b1ab8a..a99a0698 100644
--- a/include/egg/math/eggMatrix.h
+++ b/include/egg/math/eggMatrix.h
@@ -62,7 +62,7 @@ public:
     void transposeTo(Matrix34f &to) const;
     void copyFrom(const Matrix34f &other) {
         for (int i = 0; i < 12; i++) {
-            arr[i] = other.arr[i];
+            (*this)(i) = other(i);
         }
     }
     void setBase(int idx, const Vector3f &b) {
diff --git a/src/d/a/d_a_insect.cpp b/src/d/a/d_a_insect.cpp
index 56c29de0..2c18e1ed 100644
--- a/src/d/a/d_a_insect.cpp
+++ b/src/d/a/d_a_insect.cpp
@@ -21,7 +21,7 @@ extern "C" const u16 PARTICLE_RESOURCE_ID_MAPPING_394_;
 
 void dAcOInsect_c::kill() {
     dJEffManager_c::spawnEffect(PARTICLE_RESOURCE_ID_MAPPING_394_, position, nullptr, nullptr, nullptr, nullptr, 0, 0);
-    playSound(SE_Insect_DISAPPEAR); // TODO (Sound ID)
+    playSound(SE_Insect_DISAPPEAR);
     deleteRequest();
 }
 
diff --git a/src/toBeSorted/d_unk_mdl_stuff_2.cpp b/src/toBeSorted/d_unk_mdl_stuff_2.cpp
index 7ccc654f..25a8d887 100644
--- a/src/toBeSorted/d_unk_mdl_stuff_2.cpp
+++ b/src/toBeSorted/d_unk_mdl_stuff_2.cpp
@@ -127,6 +127,7 @@ void dShpProc1_c::draw() {
             mtx.copyFrom(*pTransforms);
             MTXConcat(viewMtx, mtx, mtx);
             mMtx_c mtx2;
+            // Regswaps that can be fixed with a copy inline that uses array indexing...
             mtx2.copyFrom(mtx);
             mtx2.fn_802F1C40(0, 1);
             nw4r::math::MTX33 mtx3;