dTimer_c::isStart

1 files changed, 21 insertions, 14 deletions

diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp
index 0816bfe89d..fea7eba086 100644
--- a/src/d/d_timer.cpp
+++ b/src/d/d_timer.cpp
@@ -360,37 +360,43 @@ int dTimer_c::deleteRequest() {
 }
 
 /* 8025D9F0-8025DA54 258330 0064+00 3/3 0/0 0/0 .text            getTimeMs__8dTimer_cFv */
-#ifndef NONMATCHING
 int dTimer_c::getTimeMs() {
     return (mTime2 - mTime1 - mTime5) / OS_TIMER_CLOCK_MS;
 }
-#else
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void dTimer_c::getTimeMs() {
-    nofralloc
-#include "asm/d/d_timer/getTimeMs__8dTimer_cFv.s"
-}
-#pragma pop
-#endif
-
 /* 8025DA54-8025DA9C 258394 0048+00 3/3 0/0 0/0 .text            getLimitTimeMs__8dTimer_cFv */
 int dTimer_c::getLimitTimeMs() {
-    return mTime4 / OS_TIMER_CLOCK_MS;
+    return mLimitTime / OS_TIMER_CLOCK_MS;
 }
 
 /* 8025DA9C-8025DB10 2583DC 0074+00 2/2 0/0 1/1 .text            getRestTimeMs__8dTimer_cFv */
+#ifdef NONMATCHING
+// regs swapped
+int dTimer_c::getRestTimeMs() {
+    OSTime tmpTime2 = mTime2 - mTime1 - mTime5;
+    // OSTime tmpTime = (mTime5) - mLimitTime;
+    
+   return (tmpTime2 - mLimitTime) / OS_TIMER_CLOCK_MS;
+}
+#else
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void dTimer_c::getRestTimeMs() {
+asm int dTimer_c::getRestTimeMs() {
     nofralloc
 #include "asm/d/d_timer/getRestTimeMs__8dTimer_cFv.s"
 }
 #pragma pop
+#endif
 
 /* 8025DB10-8025DB38 258450 0028+00 1/1 0/0 4/4 .text            isStart__8dTimer_cFv */
+#ifndef NONMATCHING
+int dTimer_c::isStart() {
+    if (field_0x16A != 1 && mDeleteCheck == 4) {
+        return 1;
+    }
+    return 0;
+}
+#else
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
@@ -399,6 +405,7 @@ asm void dTimer_c::isStart() {
 #include "asm/d/d_timer/isStart__8dTimer_cFv.s"
 }
 #pragma pop
+#endif
 
 /* ############################################################################################## */
 /* 803C33C0-803C33E4 -00001 0024+00 1/1 0/0 0/0 .data            @5239 */