dTimer_show and dTimer_hide

2 files changed, 26 insertions, 25 deletions

diff --git a/include/d/d_timer.h b/include/d/d_timer.h
index 7a20aced6b..dc16f38dec 100644
--- a/include/d/d_timer.h
+++ b/include/d/d_timer.h
@@ -12,6 +12,9 @@
 s32 dTimer_createStockTimer();
 
 class dDlst_TimerScrnDraw_c {
+private:
+    u8 field_0x00[0x3e1];
+    u8 mTimerVisible;
 public:
     /* 8025DB38 */ dDlst_TimerScrnDraw_c();
     /* 8025DBE0 */ void setHIO();
@@ -39,6 +42,14 @@ public:
     /* 80260AD4 */ void playBckAnimation(f32);
     /* 80260B54 */ void drawPikari(int);
     /* 80261394 */ ~dDlst_TimerScrnDraw_c();
+
+    void show() {
+        mTimerVisible = 1;
+    }
+
+    void hide() {
+        mTimerVisible = 0;
+    }
 };
 
 class dTimer_c : public msg_class {
@@ -85,6 +96,14 @@ public:
     s32 createStart(u16 param_0) {
         return ((dDlst_TimerScrnDraw_c*)field_0xfc)->createStart(param_0);
     }
+
+    void show() {
+        ((dDlst_TimerScrnDraw_c*)field_0xfc)->show();
+    }
+
+    void hide() {
+        ((dDlst_TimerScrnDraw_c*)field_0xfc)->hide();
+    }
 };
 
 #endif /* D_D_TIMER_H */
diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp
index b38d431102..6aa53e364a 100644
--- a/src/d/d_timer.cpp
+++ b/src/d/d_timer.cpp
@@ -883,7 +883,6 @@ int dTimer_isStart() {
 
 }
 /* 80261244-80261298 25BB84 0054+00 0/0 0/0 2/2 .text            dTimer_getRestTimeMs__Fv */
-#ifndef NONMATCHING
 int dTimer_getRestTimeMs() {
     int ret;
 
@@ -895,37 +894,20 @@ int dTimer_getRestTimeMs() {
 
     return ret;
 }
-#else
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void dTimer_getRestTimeMs() {
-    nofralloc
-#include "asm/d/d_timer/dTimer_getRestTimeMs__Fv.s"
-}
-#pragma pop
-#endif
 
 /* 80261298-802612EC 25BBD8 0054+00 0/0 0/0 2/2 .text            dTimer_show__Fv */
-#ifdef NONMATCHING
 void dTimer_show() {
-    
-}
-#else
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void dTimer_show() {
-    nofralloc
-#include "asm/d/d_timer/dTimer_show__Fv.s"
+    if (dComIfG_getTimerPtr()) {
+        dComIfG_getTimerPtr()->show();
+    }
 }
-#pragma pop
-#endif
 
 /* 802612EC-80261340 25BC2C 0054+00 0/0 0/0 2/2 .text            dTimer_hide__Fv */
-#ifdef NONMATCHING
+#ifndef NONMATCHING
 void dTimer_hide() {
-    
+    if (dComIfG_getTimerPtr()) {
+        dComIfG_getTimerPtr()->hide();
+    }
 }
 #else
 #pragma push