getDemoIDData matched, fix up various inlines and template classes (#2489)

* Fix debug build

* getDemoIDData matched, fix up various inlines and template classes

* Remove nonmatching comments

2 files changed, 5 insertions, 2 deletions

diff --git a/include/JSystem/JUtility/JUTFader.h b/include/JSystem/JUtility/JUTFader.h
index 7c308269a7..f6d67ac03b 100644
--- a/include/JSystem/JUtility/JUTFader.h
+++ b/include/JSystem/JUtility/JUTFader.h
@@ -25,7 +25,7 @@ public:
     /* 802E56DC */ virtual void draw();
 
     s32 getStatus() const { return mStatus; }
-    void setColor(JUtility::TColor& color) { mColor.set(color); }
+    void setColor(JUtility::TColor color) { mColor.set(color); }
 
     /* 0x04 */ s32 mStatus;
     /* 0x08 */ u16 field_0x8;
diff --git a/include/JSystem/JUtility/TColor.h b/include/JSystem/JUtility/TColor.h
index 2691dff536..0f2a684289 100644
--- a/include/JSystem/JUtility/TColor.h
+++ b/include/JSystem/JUtility/TColor.h
@@ -28,7 +28,10 @@ struct TColor : public GXColor {
     }
 
     void set(u32 u32Color) { *(u32*)&r = u32Color; }
-    void set(GXColor gxColor) { *(GXColor*)&r = gxColor; }
+    void set(GXColor gxColor) {
+        GXColor* temp = this;
+        *temp = gxColor;
+    }
 };
 }  // namespace JUtility