Add @vabold's newer setScale match

riidefi · Sep 4, 2023 · 40c587a · 40c587a
1 parent 51b3db0
commit 40c587a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/pack/symbols.yml b/pack/symbols.yml
@@ -17532,7 +17532,7 @@ global:
     0x805813a4: 'unk_805813a4'
     0x805813e8: 'unk_805813e8'
     0x8058160c: 'unk_8058160c'
-    0x80581720: 'setScale__Q24Kart8KartMoveFRCQ23EGG8Vector3f'
+    0x80581720: 'setScale__Q24Kart8KartMoveFQ23EGG8Vector3f'
     0x8058173c: 'unk_8058173c'
     0x80581778: 'unk_80581778'
     0x80581824: 'unk_80581824'

diff --git a/source/game/kart/KartMove.cpp b/source/game/kart/KartMove.cpp
@@ -195,7 +195,7 @@ extern UNKNOWN_FUNCTION(unk_805813e8);
 // PAL: 0x8058160c
 extern UNKNOWN_FUNCTION(unk_8058160c);
 // PAL: 0x80581720
-extern UNKNOWN_FUNCTION(setScale__Q24Kart8KartMoveFRCQ23EGG8Vector3f);
+extern UNKNOWN_FUNCTION(setScale__Q24Kart8KartMoveFQ23EGG8Vector3f);
 // PAL: 0x80581824
 extern UNKNOWN_FUNCTION(unk_80581824);
 // PAL: 0x80581b1c
@@ -1401,7 +1401,7 @@ asm UNKNOWN_FUNCTION(unk_8058160c) {
 
 namespace Kart {
 
-void KartMove::setScale(const EGG::Vector3f& scale) {
+void KartMove::setScale(const EGG::Vector3f scale) {
   // mScale = scale;
   mScale.x = scale.x;
   mScale.y = scale.y;

diff --git a/source/game/kart/KartMove.hpp b/source/game/kart/KartMove.hpp
@@ -201,7 +201,7 @@ UNKNOWN_FUNCTION(unk_805813e8);
 // PAL: 0x8058160c..0x80581720
 UNKNOWN_FUNCTION(unk_8058160c);
 // PAL: 0x80581720..0x8058173c
-UNKNOWN_FUNCTION(setScale__Q24Kart8KartMoveFRCQ23EGG8Vector3f);
+UNKNOWN_FUNCTION(setScale__Q24Kart8KartMoveFQ23EGG8Vector3f);
 // PAL: 0x8058173c..0x80581778
 UNKNOWN_FUNCTION(unk_8058173c);
 // PAL: 0x80581778..0x80581824
@@ -471,12 +471,14 @@ class KartJump;
 
 class KartMove : public KartObjectProxy {
 public:
-  enum DrivingDirection { DRIVING_DIRECTION_IDLE = 2 };
+  enum DrivingDirection {
+    DRIVING_DIRECTION_IDLE = 2,
+  };
 
   s16 getMaxMtCharge();
   s16 getMaxSmtCharge();
   s32 getAppliedHopStickX();
-  void setScale(const EGG::Vector3f& scale);
+  void setScale(const EGG::Vector3f scale);
   void empty(s32 arg);
   void clearBoost();
 

diff --git a/source/game/kart/KartObjectProxy.cpp b/source/game/kart/KartObjectProxy.cpp
@@ -41,7 +41,7 @@ extern UNKNOWN_FUNCTION(getMaxSmtCharge__Q24Kart8KartMoveFv);
 // PAL: 0x8057eff8
 extern UNKNOWN_FUNCTION(getAppliedHopStickX__Q24Kart8KartMoveFv);
 // PAL: 0x80581720
-extern UNKNOWN_FUNCTION(setScale__Q24Kart8KartMoveFRCQ23EGG8Vector3f);
+extern UNKNOWN_FUNCTION(setScale__Q24Kart8KartMoveFQ23EGG8Vector3f);
 // PAL: 0x80581a24
 extern UNKNOWN_FUNCTION(empty__Q24Kart8KartMoveFl);
 // PAL: 0x805832e4
@@ -1065,8 +1065,7 @@ asm UNKNOWN_FUNCTION(unk_80591468) {
 namespace Kart {
 
 void KartObjectProxy::setScale(const EGG::Vector3f& scale) {
-  EGG::Vector3f scale_ = scale;
-  kartMove()->setScale(scale_);
+  kartMove()->setScale(scale);
 }
 
 const EGG::Vector3f& KartObjectProxy::getScale() { return kartMove()->scale(); }