setFadeColor fix, some d_msg_flow functions (#339)

9 files changed, 21 insertions, 7 deletions

diff --git a/include/JSystem/JUtility/JUTFader.h b/include/JSystem/JUtility/JUTFader.h
index b9a3af2f65..3ee0a6a160 100644
--- a/include/JSystem/JUtility/JUTFader.h
+++ b/include/JSystem/JUtility/JUTFader.h
@@ -21,7 +21,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/SSystem/SComponent/c_lib.h b/include/SSystem/SComponent/c_lib.h
index e0e9c2084c..886f72583d 100644
--- a/include/SSystem/SComponent/c_lib.h
+++ b/include/SSystem/SComponent/c_lib.h
@@ -87,7 +87,12 @@ inline T cLib_maxLimit(T val, T max) {
 }
 
 template <typename T>
-T cLib_calcTimer(T* val);
+T cLib_calcTimer(T* value) {
+    if (*value != 0) {
+        *value = *value - 1;
+    }
+    return *value;
+}
 
 void MtxInit(void);
 void MtxTrans(f32, f32, f32, u8);
diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h
index e03010cf77..9b5384406c 100644
--- a/include/d/com/d_com_inf_game.h
+++ b/include/d/com/d_com_inf_game.h
@@ -1744,6 +1744,11 @@ static dAttCatch_c* dComIfGp_att_getCatghTarget();
 static void dComIfGp_setBottleStatus(u8 param_0, u8 param_1);
 bool dComIfGp_getMapTrans(int i_roomNo, f32* o_transX, f32* o_transY, s16* o_angle);
 
+
+inline void dComIfGp_itemDataInit() {
+    g_dComIfG_gameInfo.play.itemInit();
+}
+
 inline bool i_dComIfGp_checkPlayerStatus0(int param_0, u32 flag) {
     return g_dComIfG_gameInfo.play.checkPlayerStatus(param_0, 0, flag);
 }
diff --git a/include/d/d_model.h b/include/d/d_model.h
index 2a68d5bf39..4623c46053 100644
--- a/include/d/d_model.h
+++ b/include/d/d_model.h
@@ -46,7 +46,7 @@ public:
     /* 8009C8D8 */ dMdl_c* entry(J3DModelData*, u16, int);
     /* 8009C7AC */ static void create();
     /* 8009C864 */ void remove();
-    /* 8009C8C0 */ void reset();
+    /* 8009C8C0 */ static void reset();
 
     static dMdl_mng_c* m_myObj;
 
diff --git a/include/d/file/d_file_select.h b/include/d/file/d_file_select.h
index b1113c2011..5c274e7574 100644
--- a/include/d/file/d_file_select.h
+++ b/include/d/file/d_file_select.h
@@ -395,8 +395,8 @@ public:
     /* 0x0250 */ char* field_0x0250;
     /* 0x0254 */ STControl* mStick;
     /* 0x0258 */ u8 mDataNew[3];
-    /* 0x025B */ u8 field_0x025b;
-    /* 0x025C */ u8 field_0x025c[0x0264 - 0x025C];
+    /* 0x025B */ u8 field_0x025b[3];
+    /* 0x025C */ u8 field_0x025e[0x0264 - 0x025E];
     /* 0x0264 */ u8 field_0x0264;
     /* 0x0265 */ u8 mSelectNum;
     /* 0x0266 */ u8 field_0x0266;
diff --git a/include/d/s/d_s_logo.h b/include/d/s/d_s_logo.h
index 9f6502979c..a4d5f249cb 100644
--- a/include/d/s/d_s_logo.h
+++ b/include/d/s/d_s_logo.h
@@ -39,6 +39,7 @@ public:
         /* 0xF */ EXEC_SCENE_CHANGE,
     };
 
+    dScnLogo_c() {}
     /* 802560B4 */ void preLoad_dyl_create();
     /* 802560F8 */ void preLoad_dyl_remove();
     /* 8025611C */ bool preLoad_dyl();
@@ -128,4 +129,6 @@ static int phase_0(dScnLogo_c* logo);
 static int phase_1(dScnLogo_c* logo);
 static int phase_2(dScnLogo_c* logo);
 
+typedef int (*dScnLogo_Method)(dScnLogo_c*);;
+
 #endif /* D_S_D_S_LOGO_H */
diff --git a/include/d/save/d_save.h b/include/d/save/d_save.h
index fa3f80cdea..f5934842ce 100644
--- a/include/d/save/d_save.h
+++ b/include/d/save/d_save.h
@@ -1111,7 +1111,7 @@ public:
     void removeZone(int zoneNo) { mZone[zoneNo].reset(); }
     void setNoFile(u8 file) { mNoFile = file; }
     u8 getNewFile() const { return mNewFile; }
-    void setNewFile(u8 file) { mNewFile |= file; }
+    void setNewFile(u8 file) { mNewFile = file; }
 
     static const int MEMORY_SWITCH = 0x80;
     static const int DAN_SWITCH = 0x40;
diff --git a/include/dolphin/vi/vi.h b/include/dolphin/vi/vi.h
index 23abbcc408..f233b30249 100644
--- a/include/dolphin/vi/vi.h
+++ b/include/dolphin/vi/vi.h
@@ -52,6 +52,7 @@ void* VIGetNextFrameBuffer();
 void* VIGetCurrentFrameBuffer();
 void VISetBlack(BOOL);
 u32 VIGetRetraceCount();
+u32 VIGetDTVStatus();
 
 vu16 __VIRegs[59] : 0xCC002000;
 
diff --git a/include/m_Do/m_Do_graphic.h b/include/m_Do/m_Do_graphic.h
index 68ebab896b..c91282e5d6 100644
--- a/include/m_Do/m_Do_graphic.h
+++ b/include/m_Do/m_Do_graphic.h
@@ -55,7 +55,7 @@ public:
 
     static int startFadeOut(int param_0) { return JFWDisplay::getManager()->startFadeOut(param_0); }
     static int startFadeIn(int param_0) { return JFWDisplay::getManager()->startFadeIn(param_0); }
-    static void setFadeColor(JUtility::TColor& color) { mFader->setColor(color); }
+    static void setFadeColor(JUtility::TColor color) { mFader->mColor.set(color); }
     static void setClearColor(JUtility::TColor color) { JFWDisplay::getManager()->setClearColor(color); }
     static void setBackColor(GXColor& color) { mBackColor = color; }
     static void endFrame() { JFWDisplay::getManager()->endFrame(); }