Fix various issues in TUs marked `Equivalent` (#2286)

7 files changed, 12 insertions, 11 deletions

diff --git a/include/JSystem/J2DGraph/J2DTevs.h b/include/JSystem/J2DGraph/J2DTevs.h
index d7a1949a11..3b91bf4e62 100644
--- a/include/JSystem/J2DGraph/J2DTevs.h
+++ b/include/JSystem/J2DGraph/J2DTevs.h
@@ -187,6 +187,7 @@ public:
     }
     J2DIndTexCoordScale& operator=(const J2DIndTexCoordScaleInfo& info) {
         mInfo = info;
+        return *this;
     }
     /* 802EA0CC */ void load(u8);
 
diff --git a/include/SSystem/SComponent/c_lib.h b/include/SSystem/SComponent/c_lib.h
index 4357fab1f4..c6ee07af1f 100644
--- a/include/SSystem/SComponent/c_lib.h
+++ b/include/SSystem/SComponent/c_lib.h
@@ -71,6 +71,11 @@ inline T cLib_maxLimit(T val, T max) {
 }
 
 template <typename T>
+T cLib_getRndValue(T min, T range) {
+    return (T)(min + cM_rndF((f32)range));
+}
+
+template <typename T>
 T cLib_calcTimer(T* value) {
     if (*(T*)value != 0) {
         *value = *value - 1;
@@ -78,11 +83,6 @@ T cLib_calcTimer(T* value) {
     return *value;
 }
 
-template <typename T>
-T cLib_getRndValue(T min, T range) {
-    return (T)(min + cM_rndF((f32)range));
-}
-
 void MtxInit(void);
 void MtxTrans(f32, f32, f32, u8);
 void MtxScale(f32, f32, f32, u8);
diff --git a/include/d/actor/d_a_obj_life_container.h b/include/d/actor/d_a_obj_life_container.h
index f8e50269fa..e1526401dd 100644
--- a/include/d/actor/d_a_obj_life_container.h
+++ b/include/d/actor/d_a_obj_life_container.h
@@ -46,8 +46,8 @@ public:
     /* 804CE19C */ int draw();
     /* 804CE214 */ int _delete();
 
-    /* 804CE1F0 */ virtual void setListStart();
     /* 804CCFD8 */ virtual int __CreateHeap();
+    /* 804CE1F0 */ virtual void setListStart();
 
     bool chkStatus(u8 i_status) { return mStatus == i_status; }
     void setStatus(u8 i_status) { mStatus = i_status; }
diff --git a/include/d/actor/d_a_obj_volcball.h b/include/d/actor/d_a_obj_volcball.h
index ca7155796d..a69a557f87 100644
--- a/include/d/actor/d_a_obj_volcball.h
+++ b/include/d/actor/d_a_obj_volcball.h
@@ -107,8 +107,8 @@ public:
     /* 80D23904 */ int draw();
     /* 80D23A0C */ int _delete();
 
-    /* 80D23B24 */ virtual ~daObjVolcBall_c() {}
     /* 80D22DDC */ virtual BOOL eventStart();
+    /* 80D23B24 */ virtual ~daObjVolcBall_c() {}
 
     u8 getSwBit() { return fopAcM_GetParamBit(this, 0, 8); }
     u8 getSwBit2() { return fopAcM_GetParamBit(this, 8, 8); }
diff --git a/include/d/d_menu_save.h b/include/d/d_menu_save.h
index 3998edae21..ec9156f827 100644
--- a/include/d/d_menu_save.h
+++ b/include/d/d_menu_save.h
@@ -328,11 +328,11 @@ private:
     /* 0x0132 */ u8 mNoYesWakuEndAlpha[2];
     /* 0x0134 */ u8 mNoYesWakuAnmTimer[2];
     /* 0x0138 */ CPaneMgr* mpNoYesTxt[2];
-    /* 0x0140 */ J2DAnmColorKey* mpFileWakuAnm;
+    /* 0x0140 */ J2DAnmColor* mpFileWakuAnm;
     /* 0x0144 */ int mFileWakuAnmFrame;
     /* 0x0148 */ J2DAnmTextureSRTKey* mpFileWakuRotAnm;
     /* 0x014C */ int mFileWakuRotAnmFrame;
-    /* 0x0150 */ J2DAnmColorKey* field_0x150;
+    /* 0x0150 */ J2DAnmColor* field_0x150;
     /* 0x0154 */ int field_0x154;
     /* 0x0158 */ J2DAnmTextureSRTKey* field_0x158;
     /* 0x015C */ int field_0x15c;
diff --git a/include/d/d_select_icon.h b/include/d/d_select_icon.h
index 60800f34b5..577da88c2b 100644
--- a/include/d/d_select_icon.h
+++ b/include/d/d_select_icon.h
@@ -18,7 +18,7 @@ public:
     /* 80195A3C */ void animation();
     /* 80195B40 */ void setAlpha(u8);
     /* 80195B70 */ void setPos(J2DPane*, f32, f32);
-    virtual ~dSelect_icon_c() {}
+    virtual ~dSelect_icon_c(); // must be declared but not defined to match?
 
     void drawSelf() {
         field_0x4.draw();
diff --git a/include/dolphin/gx/GXFrameBuf.h b/include/dolphin/gx/GXFrameBuf.h
index 96df637f19..5e28a80be1 100644
--- a/include/dolphin/gx/GXFrameBuf.h
+++ b/include/dolphin/gx/GXFrameBuf.h
@@ -13,7 +13,7 @@ void GXSetDispCopyDst(u16 arg0, u16 arg1);
 void GXSetTexCopyDst(u16 width, u16 height, GXTexFmt format, GXBool useMIPmap);
 void GXSetDispCopyFrame2Field(GXCopyMode mode);
 void GXSetCopyClamp(GXFBClamp clamp);
-u16 GXGetNumXfbLines(const u16 efbHeight, f32 yScale);
+u16 GXGetNumXfbLines(u16 efbHeight, f32 yScale);
 f32 GXGetYScaleFactor(u16 efb_height, u16 xfb_height);
 u32 GXSetDispCopyYScale(f32 y_scale);
 void GXSetCopyClear(GXColor color, u32 clear_z);