diff --git a/include/d/d_timer.h b/include/d/d_timer.h
index f2cbf85bf26..720297f2c55 100644
--- a/include/d/d_timer.h
+++ b/include/d/d_timer.h
@@ -19,7 +19,7 @@ private:
     /* 0x118 */ OSTime mTime2;
     /* 0x120 */ u8 field_0x120[16];
     /* 0x130 */ OSTime mTime3;
-    /* 0x138 */ u8 field_0x138[8];
+    /* 0x138 */ OSTime mTime5;
     /* 0x140 */ OSTime mTime4;
     /* 0x148 */ u8 field_0x148[12];
     /* 0x154 */ int mTimerMode;
@@ -45,7 +45,7 @@ public:
     /* 8025D86C */ void restart(u8);
     /* 8025D920 */ void end(int);
     /* 8025D9E0 */ int deleteRequest();
-    /* 8025D9F0 */ void getTimeMs();
+    /* 8025D9F0 */ int getTimeMs();
     /* 8025DA54 */ int getLimitTimeMs();
     /* 8025DA9C */ void getRestTimeMs();
     /* 8025DB10 */ void isStart();
diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp
index 4f42309a445..0816bfe89d9 100644
--- a/src/d/d_timer.cpp
+++ b/src/d/d_timer.cpp
@@ -360,6 +360,11 @@ 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
@@ -368,11 +373,13 @@ asm void dTimer_c::getTimeMs() {
 #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;
 }
+
 /* 8025DA9C-8025DB10 2583DC 0074+00 2/2 0/0 1/1 .text            getRestTimeMs__8dTimer_cFv */
 #pragma push
 #pragma optimization_level 0