diff options
| author | Pheenoh <pheenoh@gmail.com> | 2022-12-22 00:37:31 -0700 |
|---|---|---|
| committer | Pheenoh <pheenoh@gmail.com> | 2022-12-22 00:37:31 -0700 |
| commit | 538c1d22141ec31288c7b06960a2e43e307d44b5 (patch) | |
| tree | c1133cb4f692b43dea7e3662747cc65c8cba929e | |
| parent | 282b2a33f440fc7a2d54fa951adc3e278ec93019 (diff) | |
dTimer_c::deleteRequest
| -rw-r--r-- | include/d/d_timer.h | 2 | ||||
| -rw-r--r-- | src/d/d_timer.cpp | 20 |
2 files changed, 9 insertions, 13 deletions
diff --git a/include/d/d_timer.h b/include/d/d_timer.h index 5bf1291573..6521f3b15c 100644 --- a/include/d/d_timer.h +++ b/include/d/d_timer.h @@ -44,7 +44,7 @@ public: /* 8025D7E8 */ int stop(u8); /* 8025D86C */ void restart(u8); /* 8025D920 */ void end(int); - /* 8025D9E0 */ void deleteRequest(); + /* 8025D9E0 */ int deleteRequest(); /* 8025D9F0 */ void getTimeMs(); /* 8025DA54 */ void getLimitTimeMs(); /* 8025DA9C */ void getRestTimeMs(); diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp index acb67d8003..c15c57c8a3 100644 --- a/src/d/d_timer.cpp +++ b/src/d/d_timer.cpp @@ -316,10 +316,9 @@ int dTimer_c::stock_start(s16 param_0) { } /* 8025D7E8-8025D86C 258128 0084+00 3/3 1/1 0/0 .text stop__8dTimer_cFUc */ -#ifndef NONMATCHING int dTimer_c::stop(u8 param_0) { int ret; - + if (field_0x16A == 1 || field_0x16B != 0) { ret = 0; } else if (mDeleteCheck != 4) { @@ -333,16 +332,6 @@ int dTimer_c::stop(u8 param_0) { return ret; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dTimer_c::stop(u8 param_0) { - nofralloc -#include "asm/d/d_timer/stop__8dTimer_cFUc.s" -} -#pragma pop -#endif /* 8025D86C-8025D920 2581AC 00B4+00 1/1 1/1 0/0 .text restart__8dTimer_cFUc */ #pragma push @@ -365,6 +354,12 @@ 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 @@ -373,6 +368,7 @@ asm void dTimer_c::deleteRequest() { #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 |