From 07419c7e9f948d5f68d26fd4d981b5efb95d4119 Mon Sep 17 00:00:00 2001
From: Pheenoh <pheenoh@gmail.com>
Date: Thu, 22 Dec 2022 13:10:09 -0700
Subject: [PATCH] dTimer_isReadyFlag

---
 include/d/d_timer.h |  6 ++++++
 src/d/d_timer.cpp   | 23 ++++++++++-------------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/include/d/d_timer.h b/include/d/d_timer.h
index dc16f38dece..69caedc432a 100644
--- a/include/d/d_timer.h
+++ b/include/d/d_timer.h
@@ -72,6 +72,8 @@ private:
     /* 0x16A */ u8 field_0x16A;
     /* 0x16B */ u8 field_0x16B;
     /* 0x16C */ u8 mDeleteCheck;
+    /* 0x16C */ u8 field_0x16D;
+    /* 0x16E */ u8 mIsReady;
 
 public:
     /* 8025CA0C */ void _create();
@@ -104,6 +106,10 @@ public:
     void hide() {
         ((dDlst_TimerScrnDraw_c*)field_0xfc)->hide();
     }
+
+    u8 isReadyFlag() {
+        return mIsReady;
+    }
 };
 
 #endif /* D_D_TIMER_H */
diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp
index 6aa53e364aa..b5a4c8162d5 100644
--- a/src/d/d_timer.cpp
+++ b/src/d/d_timer.cpp
@@ -903,27 +903,24 @@ void dTimer_show() {
 }
 
 /* 802612EC-80261340 25BC2C 0054+00 0/0 0/0 2/2 .text            dTimer_hide__Fv */
-#ifndef NONMATCHING
 void dTimer_hide() {
     if (dComIfG_getTimerPtr()) {
         dComIfG_getTimerPtr()->hide();
     }
 }
-#else
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void dTimer_hide() {
-    nofralloc
-#include "asm/d/d_timer/dTimer_hide__Fv.s"
-}
-#pragma pop
-#endif
 
 /* 80261340-80261394 25BC80 0054+00 0/0 0/0 1/1 .text            dTimer_isReadyFlag__Fv */
-#ifdef NONMATCHING
+#ifndef NONMATCHING
 u32 dTimer_isReadyFlag() {
-    
+    u32 ret;
+
+    if (dComIfG_getTimerPtr()) {
+        ret = dComIfG_getTimerPtr()->isReadyFlag();
+    } else {
+        ret = 0;
+    }
+
+    return ret;
 }
 #else
 #pragma push