From 995d81d7ea8c3dbb93f1c4257428e66039038ada Mon Sep 17 00:00:00 2001
From: Pheenoh <pheenoh@gmail.com>
Date: Thu, 22 Dec 2022 00:46:31 -0700
Subject: [PATCH] dTimer_c::getLimitTimeMs

---
 include/d/d_timer.h     |  2 +-
 include/dolphin/os/OS.h |  1 +
 src/d/d_timer.cpp       | 21 ++-------------------
 3 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/include/d/d_timer.h b/include/d/d_timer.h
index 6521f3b15c2..f2cbf85bf26 100644
--- a/include/d/d_timer.h
+++ b/include/d/d_timer.h
@@ -46,7 +46,7 @@ public:
     /* 8025D920 */ void end(int);
     /* 8025D9E0 */ int deleteRequest();
     /* 8025D9F0 */ void getTimeMs();
-    /* 8025DA54 */ void getLimitTimeMs();
+    /* 8025DA54 */ int getLimitTimeMs();
     /* 8025DA9C */ void getRestTimeMs();
     /* 8025DB10 */ void isStart();
     /* 802613DC */ void createGetIn(cXyz);
diff --git a/include/dolphin/os/OS.h b/include/dolphin/os/OS.h
index d3516b8c06a..11b60643e2c 100644
--- a/include/dolphin/os/OS.h
+++ b/include/dolphin/os/OS.h
@@ -33,6 +33,7 @@ extern "C" {
 #define OS_BUS_CLOCK (*(u32*)0x800000F8)
 #define OS_CORE_CLOCK (*(u32*)0x800000FC)
 #define OS_TIMER_CLOCK (OS_BUS_CLOCK / 4)
+#define OS_TIMER_CLOCK_MS (OS_TIMER_CLOCK / 1000)
 
 #define OS_MESSAGE_NON_BLOCKING 0
 #define OS_MESSAGE_BLOCKING 1
diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp
index c15c57c8a3c..4f42309a445 100644
--- a/src/d/d_timer.cpp
+++ b/src/d/d_timer.cpp
@@ -354,21 +354,10 @@ asm void dTimer_c::end(int param_0) {
 #pragma pop
 
 /* 8025D9E0-8025D9F0 258320 0010+00 0/0 1/1 0/0 .text            deleteRequest__8dTimer_cFv */
-#ifndef NONMATCHING
 int dTimer_c::deleteRequest() {
     mDeleteCheck = 8;
     return 1;
 }
-#else
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void dTimer_c::deleteRequest() {
-    nofralloc
-#include "asm/d/d_timer/deleteRequest__8dTimer_cFv.s"
-}
-#pragma pop
-#endif
 
 /* 8025D9F0-8025DA54 258330 0064+00 3/3 0/0 0/0 .text            getTimeMs__8dTimer_cFv */
 #pragma push
@@ -381,15 +370,9 @@ asm void dTimer_c::getTimeMs() {
 #pragma pop
 
 /* 8025DA54-8025DA9C 258394 0048+00 3/3 0/0 0/0 .text            getLimitTimeMs__8dTimer_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void dTimer_c::getLimitTimeMs() {
-    nofralloc
-#include "asm/d/d_timer/getLimitTimeMs__8dTimer_cFv.s"
+int dTimer_c::getLimitTimeMs() {
+    return mTime4 / OS_TIMER_CLOCK_MS;
 }
-#pragma pop
-
 /* 8025DA9C-8025DB10 2583DC 0074+00 2/2 0/0 1/1 .text            getRestTimeMs__8dTimer_cFv */
 #pragma push
 #pragma optimization_level 0