dTimer_c::deleteRequest

This commit is contained in:
Pheenoh 2022-12-22 00:37:31 -07:00
parent 282b2a33f4
commit 538c1d2214
2 changed files with 9 additions and 13 deletions

View File

@ -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();

View File

@ -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