From 0ef0e91aae76aae8cfe6bacd2294aae827d3d427 Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Wed, 21 Dec 2022 23:57:09 -0700 Subject: [PATCH 01/25] dTimer_c::deleteCheck --- include/d/d_timer.h | 21 ++++++++++++++++++++- src/d/d_timer.cpp | 6 ++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/include/d/d_timer.h b/include/d/d_timer.h index f4b0f517c4..a70cac2145 100644 --- a/include/d/d_timer.h +++ b/include/d/d_timer.h @@ -2,11 +2,30 @@ #define D_D_TIMER_H #include "SSystem/SComponent/c_xyz.h" +#include "SSystem/SComponent/c_phase.h" #include "dolphin/types.h" +#include "dolphin/os/OSTime.h" +#include "d/msg/d_msg_class.h" +#include "JSystem/JKernel/JKRExpHeap.h" void dTimer_createStockTimer(); -class dTimer_c { +class dTimer_c : public msg_class { +private: + /* 0x100 */ JKRExpHeap* mpHeap; + /* 0x104 */ u8 field_0x104[4]; + /* 0x108 */ request_of_phase_process_class mPhase; + /* 0x110 */ OSTime mTime1; + /* 0x118 */ OSTime mTime2; + /* 0x120 */ u8 field_0x120[32]; + /* 0x140 */ OSTime mTime3; + /* 0x148 */ u8 field_0x148[12]; + /* 0x154 */ int mTimerMode; + /* 0x158 */ u8 field_0x158[12]; + /* 0x164 */ u8 mSeIdx; + /* 0x165 */ u8 field_0x165[7]; + /* 0x16C */ u8 mDeleteCheck; + public: /* 8025CA0C */ void _create(); /* 8025CF04 */ void _execute(); diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp index c45998a6a3..7fec36a819 100644 --- a/src/d/d_timer.cpp +++ b/src/d/d_timer.cpp @@ -252,6 +252,11 @@ asm void dTimer_c::_delete() { #pragma pop /* 8025D524-8025D538 257E64 0014+00 0/0 1/1 0/0 .text deleteCheck__8dTimer_cFv */ +#ifndef NONMATCHING +int dTimer_c::deleteCheck() { + return mDeleteCheck == 7; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -260,6 +265,7 @@ asm int dTimer_c::deleteCheck() { #include "asm/d/d_timer/deleteCheck__8dTimer_cFv.s" } #pragma pop +#endif /* 8025D538-8025D618 257E78 00E0+00 1/1 1/1 0/0 .text start__8dTimer_cFi */ #pragma push From 0baf9e9a5d75813df8e59816323b1cdc615daab6 Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Thu, 22 Dec 2022 00:03:31 -0700 Subject: [PATCH 02/25] dTimer_c::stock_start --- include/d/d_timer.h | 8 +++++--- src/d/d_timer.cpp | 32 ++++++++++++++++++++------------ 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/include/d/d_timer.h b/include/d/d_timer.h index a70cac2145..83e18046d5 100644 --- a/include/d/d_timer.h +++ b/include/d/d_timer.h @@ -23,7 +23,9 @@ private: /* 0x154 */ int mTimerMode; /* 0x158 */ u8 field_0x158[12]; /* 0x164 */ u8 mSeIdx; - /* 0x165 */ u8 field_0x165[7]; + /* 0x165 */ u8 field_0x165[3]; + /* 0x168 */ s16 field_0x168; + /* 0x16A */ u8 field_0x16A[2]; /* 0x16C */ u8 mDeleteCheck; public: @@ -34,8 +36,8 @@ public: /* 8025D524 */ int deleteCheck(); /* 8025D618 */ void start(int, s16); /* 8025D538 */ void start(int); - /* 8025D7C0 */ void stock_start(s16); - /* 8025D708 */ void stock_start(); + /* 8025D7C0 */ int stock_start(s16); + /* 8025D708 */ bool stock_start(); /* 8025D7E8 */ void stop(u8); /* 8025D86C */ void restart(u8); /* 8025D920 */ void end(int); diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp index 7fec36a819..a7b378b2e2 100644 --- a/src/d/d_timer.cpp +++ b/src/d/d_timer.cpp @@ -252,20 +252,9 @@ asm void dTimer_c::_delete() { #pragma pop /* 8025D524-8025D538 257E64 0014+00 0/0 1/1 0/0 .text deleteCheck__8dTimer_cFv */ -#ifndef NONMATCHING int dTimer_c::deleteCheck() { return mDeleteCheck == 7; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dTimer_c::deleteCheck() { - nofralloc -#include "asm/d/d_timer/deleteCheck__8dTimer_cFv.s" -} -#pragma pop -#endif /* 8025D538-8025D618 257E78 00E0+00 1/1 1/1 0/0 .text start__8dTimer_cFi */ #pragma push @@ -288,16 +277,34 @@ asm void dTimer_c::start(int param_0, s16 param_1) { #pragma pop /* 8025D708-8025D7C0 258048 00B8+00 1/1 0/0 0/0 .text stock_start__8dTimer_cFv */ +#ifdef NONMATCHING +int dTimer_c::stock_start() { + if (mDeleteCheck == 0) { + field_0x168 = param_1 + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dTimer_c::stock_start() { +asm bool dTimer_c::stock_start() { nofralloc #include "asm/d/d_timer/stock_start__8dTimer_cFv.s" } #pragma pop +#endif /* 8025D7C0-8025D7E8 258100 0028+00 1/1 0/0 0/0 .text stock_start__8dTimer_cFs */ +#ifndef NONMATCHING +int dTimer_c::stock_start(s16 param_0) { + if (mDeleteCheck == 0) { + field_0x168 = param_0; + mDeleteCheck = 5; + return 1; + } + return 0; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -306,6 +313,7 @@ asm void dTimer_c::stock_start(s16 param_0) { #include "asm/d/d_timer/stock_start__8dTimer_cFs.s" } #pragma pop +#endif /* 8025D7E8-8025D86C 258128 0084+00 3/3 1/1 0/0 .text stop__8dTimer_cFUc */ #pragma push From 3d7c75bca35419c7bab1b4f6fff60f6a1fa0c9d2 Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Thu, 22 Dec 2022 00:30:04 -0700 Subject: [PATCH 03/25] dTimer_c::stock_start (no param) attempt --- include/d/com/d_com_inf_game.h | 4 ++++ src/d/d_timer.cpp | 28 ++++++++++++++-------------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h index 5905e1f4be..82e13fd123 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -2548,6 +2548,10 @@ inline void dComIfGp_particle_removeScene(bool param_0) { g_dComIfG_gameInfo.play.getParticle()->removeScene(param_0); } +inline int dComIfG_getTimerNowTimeMs() { + return g_dComIfG_gameInfo.play.getTimerNowTimeMs(); +} + inline u32 dComIfGp_particle_set(u32 param_0, u16 param_1, const cXyz* param_2, const dKy_tevstr_c* param_3, const csXyz* param_4, const cXyz* param_5, u8 param_6, dPa_levelEcallBack* param_7, diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp index a7b378b2e2..618c6b0b98 100644 --- a/src/d/d_timer.cpp +++ b/src/d/d_timer.cpp @@ -278,10 +278,21 @@ asm void dTimer_c::start(int param_0, s16 param_1) { /* 8025D708-8025D7C0 258048 00B8+00 1/1 0/0 0/0 .text stock_start__8dTimer_cFv */ #ifdef NONMATCHING -int dTimer_c::stock_start() { - if (mDeleteCheck == 0) { - field_0x168 = param_1 +bool dTimer_c::stock_start() { + if (mDeleteCheck == 5) { + mDeleteCheck = 4; + OSTime current_time = dLib_time_c::getTime(); + mTime1 = current_time; + mTime2 = current_time; + + int timer_ms = dComIfG_getTimerNowTimeMs(); + OSTime time1 = mTime1; + u32 timer_clock_ms = OS_TIMER_CLOCK / 1000; + + mTime1 = time1 - timer_clock_ms * timer_ms; + } + return mDeleteCheck == 5; } #else #pragma push @@ -295,7 +306,6 @@ asm bool dTimer_c::stock_start() { #endif /* 8025D7C0-8025D7E8 258100 0028+00 1/1 0/0 0/0 .text stock_start__8dTimer_cFs */ -#ifndef NONMATCHING int dTimer_c::stock_start(s16 param_0) { if (mDeleteCheck == 0) { field_0x168 = param_0; @@ -304,16 +314,6 @@ int dTimer_c::stock_start(s16 param_0) { } return 0; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dTimer_c::stock_start(s16 param_0) { - nofralloc -#include "asm/d/d_timer/stock_start__8dTimer_cFs.s" -} -#pragma pop -#endif /* 8025D7E8-8025D86C 258128 0084+00 3/3 1/1 0/0 .text stop__8dTimer_cFUc */ #pragma push From e31ea34fad1e2970d1d66885e686d4a5a6b94630 Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Thu, 22 Dec 2022 00:36:10 -0700 Subject: [PATCH 04/25] dTimer_c::stop --- include/d/d_timer.h | 11 +++++++---- src/d/d_timer.cpp | 19 +++++++++++++++++++ 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/include/d/d_timer.h b/include/d/d_timer.h index 83e18046d5..5bf1291573 100644 --- a/include/d/d_timer.h +++ b/include/d/d_timer.h @@ -17,15 +17,18 @@ private: /* 0x108 */ request_of_phase_process_class mPhase; /* 0x110 */ OSTime mTime1; /* 0x118 */ OSTime mTime2; - /* 0x120 */ u8 field_0x120[32]; - /* 0x140 */ OSTime mTime3; + /* 0x120 */ u8 field_0x120[16]; + /* 0x130 */ OSTime mTime3; + /* 0x138 */ u8 field_0x138[8]; + /* 0x140 */ OSTime mTime4; /* 0x148 */ u8 field_0x148[12]; /* 0x154 */ int mTimerMode; /* 0x158 */ u8 field_0x158[12]; /* 0x164 */ u8 mSeIdx; /* 0x165 */ u8 field_0x165[3]; /* 0x168 */ s16 field_0x168; - /* 0x16A */ u8 field_0x16A[2]; + /* 0x16A */ u8 field_0x16A; + /* 0x16B */ u8 field_0x16B; /* 0x16C */ u8 mDeleteCheck; public: @@ -38,7 +41,7 @@ public: /* 8025D538 */ void start(int); /* 8025D7C0 */ int stock_start(s16); /* 8025D708 */ bool stock_start(); - /* 8025D7E8 */ void stop(u8); + /* 8025D7E8 */ int stop(u8); /* 8025D86C */ void restart(u8); /* 8025D920 */ void end(int); /* 8025D9E0 */ void deleteRequest(); diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp index 618c6b0b98..acb67d8003 100644 --- a/src/d/d_timer.cpp +++ b/src/d/d_timer.cpp @@ -316,6 +316,24 @@ 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) { + ret = 0; + } else { + mTime3 = dLib_time_c::getTime(); + field_0x16A = 1; + field_0x16B = param_0; + ret = 1; + } + + return ret; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -324,6 +342,7 @@ asm void dTimer_c::stop(u8 param_0) { #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 From f2ffd6e593708892c9fe68e776a8db8eecd6151c Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Thu, 22 Dec 2022 00:37:31 -0700 Subject: [PATCH 05/25] dTimer_c::deleteRequest --- include/d/d_timer.h | 2 +- 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 From 2cc97143668337744ef522c685ab538d8884a3ac Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Thu, 22 Dec 2022 00:46:31 -0700 Subject: [PATCH 06/25] 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 6521f3b15c..f2cbf85bf2 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 d3516b8c06..11b60643e2 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 c15c57c8a3..4f42309a44 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 From 92248e39ee003416bb1b3f718c0fcea2a1c9a1e4 Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Thu, 22 Dec 2022 00:57:43 -0700 Subject: [PATCH 07/25] dTimer_c::getTimeMs --- include/d/d_timer.h | 4 ++-- src/d/d_timer.cpp | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/include/d/d_timer.h b/include/d/d_timer.h index f2cbf85bf2..720297f2c5 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 4f42309a44..0816bfe89d 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 From a0860375393a14650b60d3beba91fc91ba6692b5 Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Thu, 22 Dec 2022 01:25:35 -0700 Subject: [PATCH 08/25] dTimer_c::isStart --- include/d/d_timer.h | 6 +++--- src/d/d_timer.cpp | 43 +++++++++++++++++++++++++------------------ 2 files changed, 28 insertions(+), 21 deletions(-) diff --git a/include/d/d_timer.h b/include/d/d_timer.h index 720297f2c5..69f7499c9e 100644 --- a/include/d/d_timer.h +++ b/include/d/d_timer.h @@ -20,7 +20,7 @@ private: /* 0x120 */ u8 field_0x120[16]; /* 0x130 */ OSTime mTime3; /* 0x138 */ OSTime mTime5; - /* 0x140 */ OSTime mTime4; + /* 0x140 */ OSTime mLimitTime; /* 0x148 */ u8 field_0x148[12]; /* 0x154 */ int mTimerMode; /* 0x158 */ u8 field_0x158[12]; @@ -47,8 +47,8 @@ public: /* 8025D9E0 */ int deleteRequest(); /* 8025D9F0 */ int getTimeMs(); /* 8025DA54 */ int getLimitTimeMs(); - /* 8025DA9C */ void getRestTimeMs(); - /* 8025DB10 */ void isStart(); + /* 8025DA9C */ int getRestTimeMs(); + /* 8025DB10 */ int isStart(); /* 802613DC */ void createGetIn(cXyz); }; 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; } +/* 8025DA54-8025DA9C 258394 0048+00 3/3 0/0 0/0 .text getLimitTimeMs__8dTimer_cFv */ +int dTimer_c::getLimitTimeMs() { + 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::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; -} - -/* 8025DA9C-8025DB10 2583DC 0074+00 2/2 0/0 1/1 .text getRestTimeMs__8dTimer_cFv */ -#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 */ From 7141515882bc053e4c05f2d206a2c0819a94c050 Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Thu, 22 Dec 2022 08:06:17 -0700 Subject: [PATCH 09/25] dTimer_Draw --- src/d/d_timer.cpp | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp index fea7eba086..2ec74b3ffe 100644 --- a/src/d/d_timer.cpp +++ b/src/d/d_timer.cpp @@ -389,24 +389,12 @@ asm int dTimer_c::getRestTimeMs() { #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 -asm void dTimer_c::isStart() { - nofralloc -#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 */ SECTION_DATA static void* lit_5239[9] = { @@ -807,6 +795,11 @@ asm void dDlst_TimerScrnDraw_c::drawPikari(int param_0) { #pragma pop /* 80260F04-80260F24 25B844 0020+00 1/0 0/0 0/0 .text dTimer_Draw__FP8dTimer_c */ +#ifndef NONMATCHING +static void dTimer_Draw(dTimer_c* i_timer) { + i_timer->_draw(); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -815,6 +808,7 @@ static asm void dTimer_Draw(dTimer_c* param_0) { #include "asm/d/d_timer/dTimer_Draw__FP8dTimer_c.s" } #pragma pop +#endif /* 80260F24-80260F44 25B864 0020+00 1/0 0/0 0/0 .text dTimer_Execute__FP8dTimer_c */ #pragma push From 0c2e693e93f8833c486c41431ec5b79bd75e7d13 Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Thu, 22 Dec 2022 08:10:03 -0700 Subject: [PATCH 10/25] dTimer_Create --- src/d/d_timer.cpp | 37 +++++++++++-------------------------- 1 file changed, 11 insertions(+), 26 deletions(-) diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp index 2ec74b3ffe..554cbbccc5 100644 --- a/src/d/d_timer.cpp +++ b/src/d/d_timer.cpp @@ -795,47 +795,31 @@ asm void dDlst_TimerScrnDraw_c::drawPikari(int param_0) { #pragma pop /* 80260F04-80260F24 25B844 0020+00 1/0 0/0 0/0 .text dTimer_Draw__FP8dTimer_c */ -#ifndef NONMATCHING static void dTimer_Draw(dTimer_c* i_timer) { i_timer->_draw(); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dTimer_Draw(dTimer_c* param_0) { - nofralloc -#include "asm/d/d_timer/dTimer_Draw__FP8dTimer_c.s" -} -#pragma pop -#endif /* 80260F24-80260F44 25B864 0020+00 1/0 0/0 0/0 .text dTimer_Execute__FP8dTimer_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dTimer_Execute(dTimer_c* param_0) { - nofralloc -#include "asm/d/d_timer/dTimer_Execute__FP8dTimer_c.s" +static void dTimer_Execute(dTimer_c* i_timer) { + i_timer->_execute(); } -#pragma pop /* 80260F44-80260F4C 25B884 0008+00 1/0 0/0 0/0 .text dTimer_IsDelete__FP8dTimer_c */ -static bool dTimer_IsDelete(dTimer_c* param_0) { +static bool dTimer_IsDelete(dTimer_c* i_timer) { return true; } /* 80260F4C-80260F6C 25B88C 0020+00 1/0 0/0 0/0 .text dTimer_Delete__FP8dTimer_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dTimer_Delete(dTimer_c* param_0) { - nofralloc -#include "asm/d/d_timer/dTimer_Delete__FP8dTimer_c.s" +static void dTimer_Delete(dTimer_c* i_timer) { + i_timer->_delete(); } -#pragma pop /* 80260F6C-80260F8C 25B8AC 0020+00 1/0 0/0 0/0 .text dTimer_Create__FP9msg_class */ +#ifndef NONMATCHING +static void dTimer_Create(msg_class* i_timer) { + ((dTimer_c*)i_timer)->_create(); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -844,6 +828,7 @@ static asm void dTimer_Create(msg_class* param_0) { #include "asm/d/d_timer/dTimer_Create__FP9msg_class.s" } #pragma pop +#endif /* 80260F8C-80261034 25B8CC 00A8+00 0/0 1/1 9/9 .text dTimer_createTimer__FlUlUcUcffff */ #pragma push From b7c1d5035f85133d4d9af395711afe5c80fdce9a Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Thu, 22 Dec 2022 10:36:47 -0700 Subject: [PATCH 11/25] dTimer_createStockTimer --- include/d/com/d_com_inf_game.h | 8 ++++++ include/d/d_timer.h | 2 +- include/f_op/f_op_msg_mng.h | 6 +++++ src/d/d_timer.cpp | 48 ++++++++++++++++++++-------------- 4 files changed, 44 insertions(+), 20 deletions(-) diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h index 82e13fd123..3e1779f381 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -703,10 +703,18 @@ inline int dComIfG_getTimerMode() { return g_dComIfG_gameInfo.play.getTimerMode(); } +inline void dComIfG_setTimerMode(int mode) { + return g_dComIfG_gameInfo.play.setTimerMode(mode); +} + inline dTimer_c* dComIfG_getTimerPtr() { return g_dComIfG_gameInfo.play.getTimerPtr(); } +inline u8 dComIfG_getTimerType() { + return g_dComIfG_gameInfo.play.getTimerType(); +} + inline int dComIfG_setObjectRes(const char* name, u8 param_1, JKRHeap* heap) { return g_dComIfG_gameInfo.mResControl.setObjectRes(name, param_1, heap); } diff --git a/include/d/d_timer.h b/include/d/d_timer.h index 69f7499c9e..0d64c5870a 100644 --- a/include/d/d_timer.h +++ b/include/d/d_timer.h @@ -8,7 +8,7 @@ #include "d/msg/d_msg_class.h" #include "JSystem/JKernel/JKRExpHeap.h" -void dTimer_createStockTimer(); +s32 dTimer_createStockTimer(); class dTimer_c : public msg_class { private: diff --git a/include/f_op/f_op_msg_mng.h b/include/f_op/f_op_msg_mng.h index 05abfdc3f0..a43df3d444 100644 --- a/include/f_op/f_op_msg_mng.h +++ b/include/f_op/f_op_msg_mng.h @@ -40,5 +40,11 @@ int fopMsgM_messageSet(u32 param_0, u32 param_1); int fopMsgM_messageSetDemo(u32 param_0); msg_class* fopMsgM_SearchByID(unsigned int param_0); char* fopMsgM_messageGet(char* msg, u32 string_id); +s32 fop_Timer_create(s16 param_0, u8 param_1, u32 param_2, u8 param_3, u8 param_4, f32 param_5, + f32 param_6, f32 param_7, f32 param_8, fopMsgCreateFunc createFunc); +inline s32 fopMsgM_Timer_create(s16 param_0, u8 param_1, u32 param_2, u8 param_3, u8 param_4, f32 param_5, + f32 param_6, f32 param_7, f32 param_8, fopMsgCreateFunc createFunc) { + return fop_Timer_create(param_0, param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8, createFunc); + } #endif diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp index 554cbbccc5..6cb0841bf4 100644 --- a/src/d/d_timer.cpp +++ b/src/d/d_timer.cpp @@ -5,9 +5,11 @@ #include "d/d_timer.h" #include "d/com/d_com_inf_game.h" +#include "f_op/f_op_msg_mng.h" #include "dol2asm.h" #include "dolphin/types.h" + // // Types: // @@ -815,32 +817,24 @@ static void dTimer_Delete(dTimer_c* i_timer) { } /* 80260F6C-80260F8C 25B8AC 0020+00 1/0 0/0 0/0 .text dTimer_Create__FP9msg_class */ -#ifndef NONMATCHING static void dTimer_Create(msg_class* i_timer) { ((dTimer_c*)i_timer)->_create(); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dTimer_Create(msg_class* param_0) { - nofralloc -#include "asm/d/d_timer/dTimer_Create__FP9msg_class.s" -} -#pragma pop -#endif /* 80260F8C-80261034 25B8CC 00A8+00 0/0 1/1 9/9 .text dTimer_createTimer__FlUlUcUcffff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dTimer_createTimer(s32 param_0, u32 param_1, u8 param_2, u8 param_3, f32 param_4, +s32 dTimer_createTimer(s32 param_0, u32 param_1, u8 param_2, u8 param_3, f32 param_4, f32 param_5, f32 param_6, f32 param_7) { - nofralloc -#include "asm/d/d_timer/dTimer_createTimer__FlUlUcUcffff.s" -} -#pragma pop + s32 ret; + if (dComIfG_getTimerMode() == -1) { + ret = fopMsgM_Timer_create(0x315,param_0,param_1,param_2,param_3,param_4,param_5,param_6,param_7,0); + } + else { + ret = -1; + } + + return ret; +} /* ############################################################################################## */ /* 8039A3D8-8039A3D8 026A38 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ #pragma push @@ -863,6 +857,21 @@ SECTION_SDATA2 static f32 lit_5546 = 32.0f; SECTION_SDATA2 static f32 lit_5547 = 419.0f; /* 80261034-80261100 25B974 00CC+00 0/0 1/1 0/0 .text dTimer_createStockTimer__Fv */ +#ifndef NONMATCHING +s32 dTimer_createStockTimer() { + if (dComIfG_getTimerMode() != -1) { + if ((dComIfG_getTimerMode() == 3 || dComIfG_getTimerMode() == 4) && strcmp(dComIfGp_getStartStageName(),"F_SP115")) { + dComIfG_setTimerMode(-1); + return -1; + } else { + u8 timer_type = dComIfG_getTimerType(); + return fopMsgM_Timer_create(0x315,10,0,timer_type,0,FLOAT_LABEL(lit_5544),FLOAT_LABEL(lit_5545),FLOAT_LABEL(lit_5546),FLOAT_LABEL(lit_5547),0); + } + } else { + return -1; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -871,6 +880,7 @@ asm void dTimer_createStockTimer() { #include "asm/d/d_timer/dTimer_createStockTimer__Fv.s" } #pragma pop +#endif /* 80261100-80261188 25BA40 0088+00 0/0 0/0 1/1 .text dTimer_createGetIn2D__Fl4cXyz */ #pragma push From 5ad821abe10086c500c3e7a33c6d319bff218d04 Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Thu, 22 Dec 2022 12:31:19 -0700 Subject: [PATCH 12/25] dTimer_createGetIn2D --- include/d/d_timer.h | 2 +- src/d/d_timer.cpp | 70 +++++++++++++++++++++++++++++++++++++-------- 2 files changed, 59 insertions(+), 13 deletions(-) diff --git a/include/d/d_timer.h b/include/d/d_timer.h index 0d64c5870a..d1d4fafc97 100644 --- a/include/d/d_timer.h +++ b/include/d/d_timer.h @@ -49,7 +49,7 @@ public: /* 8025DA54 */ int getLimitTimeMs(); /* 8025DA9C */ int getRestTimeMs(); /* 8025DB10 */ int isStart(); - /* 802613DC */ void createGetIn(cXyz); + /* 802613DC */ int createGetIn(cXyz); }; #endif /* D_D_TIMER_H */ diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp index 6cb0841bf4..5acaa97c5a 100644 --- a/src/d/d_timer.cpp +++ b/src/d/d_timer.cpp @@ -8,6 +8,7 @@ #include "f_op/f_op_msg_mng.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "m_Do/m_Do_lib.h" // @@ -857,7 +858,6 @@ SECTION_SDATA2 static f32 lit_5546 = 32.0f; SECTION_SDATA2 static f32 lit_5547 = 419.0f; /* 80261034-80261100 25B974 00CC+00 0/0 1/1 0/0 .text dTimer_createStockTimer__Fv */ -#ifndef NONMATCHING s32 dTimer_createStockTimer() { if (dComIfG_getTimerMode() != -1) { if ((dComIfG_getTimerMode() == 3 || dComIfG_getTimerMode() == 4) && strcmp(dComIfGp_getStartStageName(),"F_SP115")) { @@ -871,18 +871,21 @@ s32 dTimer_createStockTimer() { return -1; } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dTimer_createStockTimer() { - nofralloc -#include "asm/d/d_timer/dTimer_createStockTimer__Fv.s" -} -#pragma pop -#endif /* 80261100-80261188 25BA40 0088+00 0/0 0/0 1/1 .text dTimer_createGetIn2D__Fl4cXyz */ +#ifndef NONMATCHING +u32 dTimer_createGetIn2D(s32 param_0, cXyz param_1) { + if (dComIfG_getTimerPtr()) { + cXyz tmp; + mDoLib_project(¶m_1,&tmp); + param_0 = dComIfG_getTimerPtr()->createGetIn(tmp); + } else { + param_0 = 0; + } + + return param_0; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -891,8 +894,14 @@ asm void dTimer_createGetIn2D(s32 param_0, cXyz param_1) { #include "asm/d/d_timer/dTimer_createGetIn2D__Fl4cXyz.s" } #pragma pop +#endif /* 80261188-802611F0 25BAC8 0068+00 1/1 0/0 0/0 .text dTimer_createStart2D__FlUs */ +#ifdef NONMATCHING +static int dTimer_createStart2D(s32 param_0, u16 param_1) { + +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -901,8 +910,14 @@ static asm void dTimer_createStart2D(s32 param_0, u16 param_1) { #include "asm/d/d_timer/dTimer_createStart2D__FlUs.s" } #pragma pop +#endif /* 802611F0-80261244 25BB30 0054+00 0/0 0/0 5/5 .text dTimer_isStart__Fv */ +#ifdef NONMATCHING +int dTimer_isStart() { + +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -911,8 +926,14 @@ asm void dTimer_isStart() { #include "asm/d/d_timer/dTimer_isStart__Fv.s" } #pragma pop +#endif /* 80261244-80261298 25BB84 0054+00 0/0 0/0 2/2 .text dTimer_getRestTimeMs__Fv */ +#ifdef NONMATCHING +int dTimer_getRestTimeMs() { + +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -921,8 +942,14 @@ asm void dTimer_getRestTimeMs() { #include "asm/d/d_timer/dTimer_getRestTimeMs__Fv.s" } #pragma pop +#endif /* 80261298-802612EC 25BBD8 0054+00 0/0 0/0 2/2 .text dTimer_show__Fv */ +#ifdef NONMATCHING +void dTimer_show() { + +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -931,8 +958,14 @@ asm void dTimer_show() { #include "asm/d/d_timer/dTimer_show__Fv.s" } #pragma pop +#endif /* 802612EC-80261340 25BC2C 0054+00 0/0 0/0 2/2 .text dTimer_hide__Fv */ +#ifdef NONMATCHING +void dTimer_hide() { + +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -941,8 +974,14 @@ asm void dTimer_hide() { #include "asm/d/d_timer/dTimer_hide__Fv.s" } #pragma pop +#endif /* 80261340-80261394 25BC80 0054+00 0/0 0/0 1/1 .text dTimer_isReadyFlag__Fv */ +#ifdef NONMATCHING +u32 dTimer_isReadyFlag() { + +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -951,6 +990,7 @@ asm void dTimer_isReadyFlag() { #include "asm/d/d_timer/dTimer_isReadyFlag__Fv.s" } #pragma pop +#endif /* 80261394-802613DC 25BCD4 0048+00 1/0 0/0 0/0 .text __dt__21dDlst_TimerScrnDraw_cFv */ #pragma push @@ -963,13 +1003,19 @@ asm dDlst_TimerScrnDraw_c::~dDlst_TimerScrnDraw_c() { #pragma pop /* 802613DC-8026141C 25BD1C 0040+00 1/1 0/0 0/0 .text createGetIn__8dTimer_cF4cXyz */ +#ifdef NONMATCHING +void dTimer_c::createGetIn(cXyz param_0) { + +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dTimer_c::createGetIn(cXyz param_0) { +asm int dTimer_c::createGetIn(cXyz param_0) { nofralloc #include "asm/d/d_timer/createGetIn__8dTimer_cF4cXyz.s" } #pragma pop +#endif /* 8039A3D8-8039A3D8 026A38 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ From 7165b79090c55a1fed5c5ddeb63a2a7bbf19afba Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Thu, 22 Dec 2022 12:58:10 -0700 Subject: [PATCH 13/25] dTimer_createStart2D --- include/d/d_timer.h | 35 +++++++++++++++++++++ include/d/msg/d_msg_class.h | 1 + include/f_op/f_op_msg_mng.h | 2 +- src/d/d_timer.cpp | 62 ++++++------------------------------- 4 files changed, 47 insertions(+), 53 deletions(-) diff --git a/include/d/d_timer.h b/include/d/d_timer.h index d1d4fafc97..7a20aced6b 100644 --- a/include/d/d_timer.h +++ b/include/d/d_timer.h @@ -7,9 +7,40 @@ #include "dolphin/os/OSTime.h" #include "d/msg/d_msg_class.h" #include "JSystem/JKernel/JKRExpHeap.h" +#include "JSystem/J2DGraph/J2DPane.h" s32 dTimer_createStockTimer(); +class dDlst_TimerScrnDraw_c { +public: + /* 8025DB38 */ dDlst_TimerScrnDraw_c(); + /* 8025DBE0 */ void setHIO(); + /* 8025DFBC */ void setScreen(s32, JKRArchive*); + /* 8025E240 */ void setScreenBase(); + /* 8025E66C */ void setScreenBoatRace(); + /* 8025E8B8 */ void setScreenRider(); + /* 8025EB20 */ void hideDenominator(); + /* 8025EC5C */ void deleteScreen(); + /* 8025EE24 */ void changeNumberTexture(J2DPane*, int); + /* 8025EECC */ void getNumber(int); + /* 8025EEF0 */ void setTimer(int); + /* 8025F180 */ void setCounter(u8, u8); + /* 8025FA00 */ void setParentPos(f32, f32); + /* 8025FA2C */ void setTimerPos(f32, f32); + /* 8025FA6C */ void setCounterPos(f32, f32); + /* 8025FA98 */ void setImagePos(f32, f32); + /* 8025FAC4 */ void setShowType(u8); + /* 8025FB74 */ void anime(); + /* 8025FF98 */ void closeAnime(); + /* 802601E4 */ void createGetIn(cXyz); + /* 80260574 */ s32 createStart(u16); + /* 80260690 */ void draw(); + /* 80260AA8 */ void checkStartAnimeEnd(); + /* 80260AD4 */ void playBckAnimation(f32); + /* 80260B54 */ void drawPikari(int); + /* 80261394 */ ~dDlst_TimerScrnDraw_c(); +}; + class dTimer_c : public msg_class { private: /* 0x100 */ JKRExpHeap* mpHeap; @@ -50,6 +81,10 @@ public: /* 8025DA9C */ int getRestTimeMs(); /* 8025DB10 */ int isStart(); /* 802613DC */ int createGetIn(cXyz); + + s32 createStart(u16 param_0) { + return ((dDlst_TimerScrnDraw_c*)field_0xfc)->createStart(param_0); + } }; #endif /* D_D_TIMER_H */ diff --git a/include/d/msg/d_msg_class.h b/include/d/msg/d_msg_class.h index 71593d6de3..60e36b8758 100644 --- a/include/d/msg/d_msg_class.h +++ b/include/d/msg/d_msg_class.h @@ -4,6 +4,7 @@ #include "dolphin/types.h" #include "f_op/f_op_actor.h" + class msg_class : public leafdraw_class { public: /* 0xC0 */ int field_0xc0; diff --git a/include/f_op/f_op_msg_mng.h b/include/f_op/f_op_msg_mng.h index a43df3d444..7cafe41427 100644 --- a/include/f_op/f_op_msg_mng.h +++ b/include/f_op/f_op_msg_mng.h @@ -45,6 +45,6 @@ s32 fop_Timer_create(s16 param_0, u8 param_1, u32 param_2, u8 param_3, u8 param_ inline s32 fopMsgM_Timer_create(s16 param_0, u8 param_1, u32 param_2, u8 param_3, u8 param_4, f32 param_5, f32 param_6, f32 param_7, f32 param_8, fopMsgCreateFunc createFunc) { return fop_Timer_create(param_0, param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8, createFunc); - } +} #endif diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp index 5acaa97c5a..a1fef2a117 100644 --- a/src/d/d_timer.cpp +++ b/src/d/d_timer.cpp @@ -19,34 +19,7 @@ struct dMsgObject_c { /* 8023822C */ void getStatus(); }; -struct dDlst_TimerScrnDraw_c { - /* 8025DB38 */ dDlst_TimerScrnDraw_c(); - /* 8025DBE0 */ void setHIO(); - /* 8025DFBC */ void setScreen(s32, JKRArchive*); - /* 8025E240 */ void setScreenBase(); - /* 8025E66C */ void setScreenBoatRace(); - /* 8025E8B8 */ void setScreenRider(); - /* 8025EB20 */ void hideDenominator(); - /* 8025EC5C */ void deleteScreen(); - /* 8025EE24 */ void changeNumberTexture(J2DPane*, int); - /* 8025EECC */ void getNumber(int); - /* 8025EEF0 */ void setTimer(int); - /* 8025F180 */ void setCounter(u8, u8); - /* 8025FA00 */ void setParentPos(f32, f32); - /* 8025FA2C */ void setTimerPos(f32, f32); - /* 8025FA6C */ void setCounterPos(f32, f32); - /* 8025FA98 */ void setImagePos(f32, f32); - /* 8025FAC4 */ void setShowType(u8); - /* 8025FB74 */ void anime(); - /* 8025FF98 */ void closeAnime(); - /* 802601E4 */ void createGetIn(cXyz); - /* 80260574 */ void createStart(u16); - /* 80260690 */ void draw(); - /* 80260AA8 */ void checkStartAnimeEnd(); - /* 80260AD4 */ void playBckAnimation(f32); - /* 80260B54 */ void drawPikari(int); - /* 80261394 */ ~dDlst_TimerScrnDraw_c(); -}; + struct J2DAnmLoaderDataBase { /* 80308A6C */ void load(void const*); @@ -739,7 +712,7 @@ asm void dDlst_TimerScrnDraw_c::createGetIn(cXyz param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dDlst_TimerScrnDraw_c::createStart(u16 param_0) { +asm s32 dDlst_TimerScrnDraw_c::createStart(u16 param_0) { nofralloc #include "asm/d/d_timer/createStart__21dDlst_TimerScrnDraw_cFUs.s" } @@ -873,7 +846,6 @@ s32 dTimer_createStockTimer() { } /* 80261100-80261188 25BA40 0088+00 0/0 0/0 1/1 .text dTimer_createGetIn2D__Fl4cXyz */ -#ifndef NONMATCHING u32 dTimer_createGetIn2D(s32 param_0, cXyz param_1) { if (dComIfG_getTimerPtr()) { cXyz tmp; @@ -885,32 +857,18 @@ u32 dTimer_createGetIn2D(s32 param_0, cXyz param_1) { return param_0; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dTimer_createGetIn2D(s32 param_0, cXyz param_1) { - nofralloc -#include "asm/d/d_timer/dTimer_createGetIn2D__Fl4cXyz.s" -} -#pragma pop -#endif /* 80261188-802611F0 25BAC8 0068+00 1/1 0/0 0/0 .text dTimer_createStart2D__FlUs */ -#ifdef NONMATCHING static int dTimer_createStart2D(s32 param_0, u16 param_1) { - + dTimer_c* timer = dComIfG_getTimerPtr(); + if (timer) { + param_0 = dComIfG_getTimerPtr()->createStart(param_1); + } else { + param_0 = 0; + } + + return param_0; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dTimer_createStart2D(s32 param_0, u16 param_1) { - nofralloc -#include "asm/d/d_timer/dTimer_createStart2D__FlUs.s" -} -#pragma pop -#endif /* 802611F0-80261244 25BB30 0054+00 0/0 0/0 5/5 .text dTimer_isStart__Fv */ #ifdef NONMATCHING From 4029786c807273d8f3beb3a73cd1eab7921ec00a Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Thu, 22 Dec 2022 13:02:32 -0700 Subject: [PATCH 14/25] dTimer_isStart --- src/d/d_timer.cpp | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp index a1fef2a117..add562a252 100644 --- a/src/d/d_timer.cpp +++ b/src/d/d_timer.cpp @@ -860,8 +860,7 @@ u32 dTimer_createGetIn2D(s32 param_0, cXyz param_1) { /* 80261188-802611F0 25BAC8 0068+00 1/1 0/0 0/0 .text dTimer_createStart2D__FlUs */ static int dTimer_createStart2D(s32 param_0, u16 param_1) { - dTimer_c* timer = dComIfG_getTimerPtr(); - if (timer) { + if (dComIfG_getTimerPtr()) { param_0 = dComIfG_getTimerPtr()->createStart(param_1); } else { param_0 = 0; @@ -871,9 +870,17 @@ static int dTimer_createStart2D(s32 param_0, u16 param_1) { } /* 802611F0-80261244 25BB30 0054+00 0/0 0/0 5/5 .text dTimer_isStart__Fv */ -#ifdef NONMATCHING +#ifndef NONMATCHING int dTimer_isStart() { - + int ret; + if (dComIfG_getTimerPtr()) { + ret = dComIfG_getTimerPtr()->isStart(); + } else { + ret = 0; + } + + return ret; + } #else #pragma push From 9c91cdee047b866d66341e9a4904a73813994fbe Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Thu, 22 Dec 2022 13:03:11 -0700 Subject: [PATCH 15/25] dTimer_getRestTimeMs --- src/d/d_timer.cpp | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp index add562a252..b38d431102 100644 --- a/src/d/d_timer.cpp +++ b/src/d/d_timer.cpp @@ -870,9 +870,9 @@ static int dTimer_createStart2D(s32 param_0, u16 param_1) { } /* 802611F0-80261244 25BB30 0054+00 0/0 0/0 5/5 .text dTimer_isStart__Fv */ -#ifndef NONMATCHING int dTimer_isStart() { int ret; + if (dComIfG_getTimerPtr()) { ret = dComIfG_getTimerPtr()->isStart(); } else { @@ -882,21 +882,18 @@ int dTimer_isStart() { return ret; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dTimer_isStart() { - nofralloc -#include "asm/d/d_timer/dTimer_isStart__Fv.s" -} -#pragma pop -#endif - /* 80261244-80261298 25BB84 0054+00 0/0 0/0 2/2 .text dTimer_getRestTimeMs__Fv */ -#ifdef NONMATCHING +#ifndef NONMATCHING int dTimer_getRestTimeMs() { - + int ret; + + if (dComIfG_getTimerPtr()) { + ret = dComIfG_getTimerPtr()->getRestTimeMs(); + } else { + ret = 0; + } + + return ret; } #else #pragma push From 21397ecabc85859ccb3a944eeab4fc18d34f8720 Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Thu, 22 Dec 2022 13:07:26 -0700 Subject: [PATCH 16/25] dTimer_show and dTimer_hide --- include/d/d_timer.h | 19 +++++++++++++++++++ src/d/d_timer.cpp | 32 +++++++------------------------- 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/include/d/d_timer.h b/include/d/d_timer.h index 7a20aced6b..dc16f38dec 100644 --- a/include/d/d_timer.h +++ b/include/d/d_timer.h @@ -12,6 +12,9 @@ s32 dTimer_createStockTimer(); class dDlst_TimerScrnDraw_c { +private: + u8 field_0x00[0x3e1]; + u8 mTimerVisible; public: /* 8025DB38 */ dDlst_TimerScrnDraw_c(); /* 8025DBE0 */ void setHIO(); @@ -39,6 +42,14 @@ public: /* 80260AD4 */ void playBckAnimation(f32); /* 80260B54 */ void drawPikari(int); /* 80261394 */ ~dDlst_TimerScrnDraw_c(); + + void show() { + mTimerVisible = 1; + } + + void hide() { + mTimerVisible = 0; + } }; class dTimer_c : public msg_class { @@ -85,6 +96,14 @@ public: s32 createStart(u16 param_0) { return ((dDlst_TimerScrnDraw_c*)field_0xfc)->createStart(param_0); } + + void show() { + ((dDlst_TimerScrnDraw_c*)field_0xfc)->show(); + } + + void hide() { + ((dDlst_TimerScrnDraw_c*)field_0xfc)->hide(); + } }; #endif /* D_D_TIMER_H */ diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp index b38d431102..6aa53e364a 100644 --- a/src/d/d_timer.cpp +++ b/src/d/d_timer.cpp @@ -883,7 +883,6 @@ int dTimer_isStart() { } /* 80261244-80261298 25BB84 0054+00 0/0 0/0 2/2 .text dTimer_getRestTimeMs__Fv */ -#ifndef NONMATCHING int dTimer_getRestTimeMs() { int ret; @@ -895,37 +894,20 @@ int dTimer_getRestTimeMs() { return ret; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dTimer_getRestTimeMs() { - nofralloc -#include "asm/d/d_timer/dTimer_getRestTimeMs__Fv.s" -} -#pragma pop -#endif /* 80261298-802612EC 25BBD8 0054+00 0/0 0/0 2/2 .text dTimer_show__Fv */ -#ifdef NONMATCHING void dTimer_show() { - + if (dComIfG_getTimerPtr()) { + dComIfG_getTimerPtr()->show(); + } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dTimer_show() { - nofralloc -#include "asm/d/d_timer/dTimer_show__Fv.s" -} -#pragma pop -#endif /* 802612EC-80261340 25BC2C 0054+00 0/0 0/0 2/2 .text dTimer_hide__Fv */ -#ifdef NONMATCHING +#ifndef NONMATCHING void dTimer_hide() { - + if (dComIfG_getTimerPtr()) { + dComIfG_getTimerPtr()->hide(); + } } #else #pragma push From 1a7f4b9feab611d8c64d604daae133dfc346f166 Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Thu, 22 Dec 2022 13:10:09 -0700 Subject: [PATCH 17/25] dTimer_isReadyFlag --- include/d/d_timer.h | 6 ++++++ src/d/d_timer.cpp | 23 ++++++++++------------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/include/d/d_timer.h b/include/d/d_timer.h index dc16f38dec..69caedc432 100644 --- a/include/d/d_timer.h +++ b/include/d/d_timer.h @@ -72,6 +72,8 @@ private: /* 0x16A */ u8 field_0x16A; /* 0x16B */ u8 field_0x16B; /* 0x16C */ u8 mDeleteCheck; + /* 0x16C */ u8 field_0x16D; + /* 0x16E */ u8 mIsReady; public: /* 8025CA0C */ void _create(); @@ -104,6 +106,10 @@ public: void hide() { ((dDlst_TimerScrnDraw_c*)field_0xfc)->hide(); } + + u8 isReadyFlag() { + return mIsReady; + } }; #endif /* D_D_TIMER_H */ diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp index 6aa53e364a..b5a4c8162d 100644 --- a/src/d/d_timer.cpp +++ b/src/d/d_timer.cpp @@ -903,27 +903,24 @@ void dTimer_show() { } /* 802612EC-80261340 25BC2C 0054+00 0/0 0/0 2/2 .text dTimer_hide__Fv */ -#ifndef NONMATCHING void dTimer_hide() { if (dComIfG_getTimerPtr()) { dComIfG_getTimerPtr()->hide(); } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dTimer_hide() { - nofralloc -#include "asm/d/d_timer/dTimer_hide__Fv.s" -} -#pragma pop -#endif /* 80261340-80261394 25BC80 0054+00 0/0 0/0 1/1 .text dTimer_isReadyFlag__Fv */ -#ifdef NONMATCHING +#ifndef NONMATCHING u32 dTimer_isReadyFlag() { - + u32 ret; + + if (dComIfG_getTimerPtr()) { + ret = dComIfG_getTimerPtr()->isReadyFlag(); + } else { + ret = 0; + } + + return ret; } #else #pragma push From 2f5c5f0de6b17ff0d3f38db66254b07914e376fa Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Thu, 22 Dec 2022 13:32:41 -0700 Subject: [PATCH 18/25] dTimer_c::_draw --- include/d/d_timer.h | 3 ++- src/d/d_timer.cpp | 39 ++++++++++++++++++--------------------- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/include/d/d_timer.h b/include/d/d_timer.h index 69caedc432..b46a3238b9 100644 --- a/include/d/d_timer.h +++ b/include/d/d_timer.h @@ -6,6 +6,7 @@ #include "dolphin/types.h" #include "dolphin/os/OSTime.h" #include "d/msg/d_msg_class.h" +#include "d/msg/d_msg_object.h" #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/J2DGraph/J2DPane.h" @@ -78,7 +79,7 @@ private: public: /* 8025CA0C */ void _create(); /* 8025CF04 */ void _execute(); - /* 8025D33C */ void _draw(); + /* 8025D33C */ int _draw(); /* 8025D3BC */ void _delete(); /* 8025D524 */ int deleteCheck(); /* 8025D618 */ void start(int, s16); diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp index b5a4c8162d..1d52d160ad 100644 --- a/src/d/d_timer.cpp +++ b/src/d/d_timer.cpp @@ -15,10 +15,6 @@ // Types: // -struct dMsgObject_c { - /* 8023822C */ void getStatus(); -}; - struct J2DAnmLoaderDataBase { @@ -208,6 +204,23 @@ asm void dTimer_c::_execute() { #pragma pop /* 8025D33C-8025D3BC 257C7C 0080+00 1/1 0/0 0/0 .text _draw__8dTimer_cFv */ + +#ifndef NONMATCHING +int dTimer_c::_draw() { + int ret; + + if (dComIfGp_isPauseFlag() || dMsgObject_isTalkNowCheck()) { + ret = 1; + } else { + dComIfGd_set2DOpa((dDlst_base_c*)field_0xfc); + ret = 1; + } + + + return ret; + +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -216,6 +229,7 @@ asm void dTimer_c::_draw() { #include "asm/d/d_timer/_draw__8dTimer_cFv.s" } #pragma pop +#endif /* 8025D3BC-8025D524 257CFC 0168+00 1/1 0/0 0/0 .text _delete__8dTimer_cFv */ #pragma push @@ -910,7 +924,6 @@ void dTimer_hide() { } /* 80261340-80261394 25BC80 0054+00 0/0 0/0 1/1 .text dTimer_isReadyFlag__Fv */ -#ifndef NONMATCHING u32 dTimer_isReadyFlag() { u32 ret; @@ -922,16 +935,6 @@ u32 dTimer_isReadyFlag() { return ret; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dTimer_isReadyFlag() { - nofralloc -#include "asm/d/d_timer/dTimer_isReadyFlag__Fv.s" -} -#pragma pop -#endif /* 80261394-802613DC 25BCD4 0048+00 1/0 0/0 0/0 .text __dt__21dDlst_TimerScrnDraw_cFv */ #pragma push @@ -944,11 +947,6 @@ asm dDlst_TimerScrnDraw_c::~dDlst_TimerScrnDraw_c() { #pragma pop /* 802613DC-8026141C 25BD1C 0040+00 1/1 0/0 0/0 .text createGetIn__8dTimer_cF4cXyz */ -#ifdef NONMATCHING -void dTimer_c::createGetIn(cXyz param_0) { - -} -#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -957,6 +955,5 @@ asm int dTimer_c::createGetIn(cXyz param_0) { #include "asm/d/d_timer/createGetIn__8dTimer_cF4cXyz.s" } #pragma pop -#endif /* 8039A3D8-8039A3D8 026A38 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ From 27bb534a9e3ed10a451ddc725a82bab3a0d1da68 Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Thu, 22 Dec 2022 13:49:29 -0700 Subject: [PATCH 19/25] dTime_c::stock_start attempt again --- src/d/d_timer.cpp | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp index 1d52d160ad..fa61c2035e 100644 --- a/src/d/d_timer.cpp +++ b/src/d/d_timer.cpp @@ -205,7 +205,6 @@ asm void dTimer_c::_execute() { /* 8025D33C-8025D3BC 257C7C 0080+00 1/1 0/0 0/0 .text _draw__8dTimer_cFv */ -#ifndef NONMATCHING int dTimer_c::_draw() { int ret; @@ -220,16 +219,6 @@ int dTimer_c::_draw() { return ret; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dTimer_c::_draw() { - nofralloc -#include "asm/d/d_timer/_draw__8dTimer_cFv.s" -} -#pragma pop -#endif /* 8025D3BC-8025D524 257CFC 0168+00 1/1 0/0 0/0 .text _delete__8dTimer_cFv */ #pragma push @@ -275,12 +264,7 @@ bool dTimer_c::stock_start() { mTime1 = current_time; mTime2 = current_time; - int timer_ms = dComIfG_getTimerNowTimeMs(); - OSTime time1 = mTime1; - u32 timer_clock_ms = OS_TIMER_CLOCK / 1000; - - mTime1 = time1 - timer_clock_ms * timer_ms; - + mTime1 -= OS_TIMER_CLOCK_MS * dComIfG_getTimerNowTimeMs(); } return mDeleteCheck == 5; } From 21e1ec1109aab71e9b87d1c16e8ab04e8c368746 Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Thu, 22 Dec 2022 14:36:27 -0700 Subject: [PATCH 20/25] dTimer_c::restart --- include/d/d_timer.h | 2 +- src/d/d_timer.cpp | 22 +++++++++++++++------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/include/d/d_timer.h b/include/d/d_timer.h index b46a3238b9..569bedfe62 100644 --- a/include/d/d_timer.h +++ b/include/d/d_timer.h @@ -87,7 +87,7 @@ public: /* 8025D7C0 */ int stock_start(s16); /* 8025D708 */ bool stock_start(); /* 8025D7E8 */ int stop(u8); - /* 8025D86C */ void restart(u8); + /* 8025D86C */ int restart(u8); /* 8025D920 */ void end(int); /* 8025D9E0 */ int deleteRequest(); /* 8025D9F0 */ int getTimeMs(); diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp index fa61c2035e..c25872b679 100644 --- a/src/d/d_timer.cpp +++ b/src/d/d_timer.cpp @@ -308,14 +308,22 @@ int dTimer_c::stop(u8 param_0) { } /* 8025D86C-8025D920 2581AC 00B4+00 1/1 1/1 0/0 .text restart__8dTimer_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dTimer_c::restart(u8 param_0) { - nofralloc -#include "asm/d/d_timer/restart__8dTimer_cFUc.s" +int dTimer_c::restart(u8 param_0) { + if (field_0x16A != 1 || field_0x16B != param_0) { + return 0; + } else { + if (mDeleteCheck != 4 && mDeleteCheck != 2) { + return 0; + } else { + mTime2 = dLib_time_c::getTime(); + OSTime tmp = mTime2 - mTime3; + mTime5 += tmp; + field_0x16A = 0; + field_0x16B = 0; + return 1; + } + } } -#pragma pop /* 8025D920-8025D9E0 258260 00C0+00 0/0 1/1 0/0 .text end__8dTimer_cFi */ #pragma push From dde4e741d7424f7f1d4e5a323fb9778ea37b7239 Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Thu, 22 Dec 2022 15:27:33 -0700 Subject: [PATCH 21/25] dTimer_c::end --- include/d/com/d_com_inf_game.h | 4 ++++ include/d/d_timer.h | 8 +++++--- src/d/d_timer.cpp | 23 +++++++++++++++++++++-- 3 files changed, 30 insertions(+), 5 deletions(-) diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h index 3e1779f381..ca67de5fdc 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -2560,6 +2560,10 @@ inline int dComIfG_getTimerNowTimeMs() { return g_dComIfG_gameInfo.play.getTimerNowTimeMs(); } +inline int dComIfG_setTimerNowTimeMs(int time) { + g_dComIfG_gameInfo.play.setTimerNowTimeMs(time); +} + inline u32 dComIfGp_particle_set(u32 param_0, u16 param_1, const cXyz* param_2, const dKy_tevstr_c* param_3, const csXyz* param_4, const cXyz* param_5, u8 param_6, dPa_levelEcallBack* param_7, diff --git a/include/d/d_timer.h b/include/d/d_timer.h index 569bedfe62..14eef713cf 100644 --- a/include/d/d_timer.h +++ b/include/d/d_timer.h @@ -60,13 +60,15 @@ private: /* 0x108 */ request_of_phase_process_class mPhase; /* 0x110 */ OSTime mTime1; /* 0x118 */ OSTime mTime2; - /* 0x120 */ u8 field_0x120[16]; + /* 0x120 */ OSTime mTime6; + /* 0x128 */ u8 field_0x128; /* 0x130 */ OSTime mTime3; /* 0x138 */ OSTime mTime5; /* 0x140 */ OSTime mLimitTime; /* 0x148 */ u8 field_0x148[12]; /* 0x154 */ int mTimerMode; - /* 0x158 */ u8 field_0x158[12]; + /* 0x158 */ int field_0x158; + /* 0x15C */ u8 field_0x15c[8]; /* 0x164 */ u8 mSeIdx; /* 0x165 */ u8 field_0x165[3]; /* 0x168 */ s16 field_0x168; @@ -88,7 +90,7 @@ public: /* 8025D708 */ bool stock_start(); /* 8025D7E8 */ int stop(u8); /* 8025D86C */ int restart(u8); - /* 8025D920 */ void end(int); + /* 8025D920 */ int end(int); /* 8025D9E0 */ int deleteRequest(); /* 8025D9F0 */ int getTimeMs(); /* 8025DA54 */ int getLimitTimeMs(); diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp index c25872b679..f149252e7b 100644 --- a/src/d/d_timer.cpp +++ b/src/d/d_timer.cpp @@ -316,8 +316,7 @@ int dTimer_c::restart(u8 param_0) { return 0; } else { mTime2 = dLib_time_c::getTime(); - OSTime tmp = mTime2 - mTime3; - mTime5 += tmp; + mTime5 += mTime2 - mTime3; field_0x16A = 0; field_0x16B = 0; return 1; @@ -326,6 +325,25 @@ int dTimer_c::restart(u8 param_0) { } /* 8025D920-8025D9E0 258260 00C0+00 0/0 1/1 0/0 .text end__8dTimer_cFi */ +#ifndef NONMATCHING +int dTimer_c::end(int param_0) { + int ret; + if (mDeleteCheck != 4) { + ret = 0; + + } else { + mTime6 = dLib_time_c::getTime(); + mDeleteCheck = 6; + dComIfG_setTimerNowTimeMs((mTime6 - mTime1 - mTime5) / OS_TIMER_CLOCK_MS); + if (param_0 != -1) { + field_0x158 = param_0; + } + ret = 1; + } + + return ret; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -334,6 +352,7 @@ asm void dTimer_c::end(int param_0) { #include "asm/d/d_timer/end__8dTimer_cFi.s" } #pragma pop +#endif /* 8025D9E0-8025D9F0 258320 0010+00 0/0 1/1 0/0 .text deleteRequest__8dTimer_cFv */ int dTimer_c::deleteRequest() { From 224ed70d66f3f48b0a870e96c1edae6f8fb53105 Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Thu, 22 Dec 2022 15:52:44 -0700 Subject: [PATCH 22/25] dDlst_TimerScrnDraw_c::getNumber --- include/d/d_timer.h | 21 ++++++++++++++++++--- src/d/d_timer.cpp | 38 +++++++++++++++++++++++++++----------- 2 files changed, 45 insertions(+), 14 deletions(-) diff --git a/include/d/d_timer.h b/include/d/d_timer.h index 14eef713cf..1b39147cab 100644 --- a/include/d/d_timer.h +++ b/include/d/d_timer.h @@ -14,8 +14,23 @@ s32 dTimer_createStockTimer(); class dDlst_TimerScrnDraw_c { private: - u8 field_0x00[0x3e1]; - u8 mTimerVisible; + /* 0x000 */ u8 field_0x000[0x3B0]; + /* 0x3B0 */ int field_0x3B0;; + /* 0x3B4 */ int field_0x3B4; + /* 0x3B8 */ int field_0x3B8; + /* 0x3BC */ int field_0x3BC; + /* 0x3C0 */ u8 field_0x3C0[12]; + /* 0x3CC */ int field_0x3CC; + /* 0x3D0 */ int field_0x3D0; + /* 0x3D4 */ int field_0x3D4; + /* 0x3D8 */ int field_0x3D8; + /* 0x3DC */ u8 field_0x3DC; + // /* 0x3DC */ u8 field_0x3DD; + /* 0x3DE */ u8 field_0x3DE; + /* 0x3DF */ u8 field_0x3DF; + /* 0x3E0 */ u8 field_0x3E0; + /* 0x3E1 */ u8 field_0x3E1; + /* 0x3E2 */ u8 mTimerVisible; public: /* 8025DB38 */ dDlst_TimerScrnDraw_c(); /* 8025DBE0 */ void setHIO(); @@ -26,7 +41,7 @@ public: /* 8025EB20 */ void hideDenominator(); /* 8025EC5C */ void deleteScreen(); /* 8025EE24 */ void changeNumberTexture(J2DPane*, int); - /* 8025EECC */ void getNumber(int); + /* 8025EECC */ char* getNumber(int); /* 8025EEF0 */ void setTimer(int); /* 8025F180 */ void setCounter(u8, u8); /* 8025FA00 */ void setParentPos(f32, f32); diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp index f149252e7b..9a54c4226f 100644 --- a/src/d/d_timer.cpp +++ b/src/d/d_timer.cpp @@ -325,7 +325,6 @@ int dTimer_c::restart(u8 param_0) { } /* 8025D920-8025D9E0 258260 00C0+00 0/0 1/1 0/0 .text end__8dTimer_cFi */ -#ifndef NONMATCHING int dTimer_c::end(int param_0) { int ret; if (mDeleteCheck != 4) { @@ -343,16 +342,6 @@ int dTimer_c::end(int param_0) { return ret; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dTimer_c::end(int param_0) { - nofralloc -#include "asm/d/d_timer/end__8dTimer_cFi.s" -} -#pragma pop -#endif /* 8025D9E0-8025D9F0 258320 0010+00 0/0 1/1 0/0 .text deleteRequest__8dTimer_cFv */ int dTimer_c::deleteRequest() { @@ -435,6 +424,26 @@ SECTION_DATA extern void* __vt__21dDlst_TimerScrnDraw_c[4] = { }; /* 8025DB38-8025DBE0 258478 00A8+00 1/1 0/0 0/0 .text __ct__21dDlst_TimerScrnDraw_cFv */ +#ifdef NONMATCHING +dDlst_TimerScrnDraw_c::dDlst_TimerScrnDraw_c() { + mTimerVisible = 0; + field_0x3DD = 0; + field_0x3D8 = 0; + field_0x3CC = -1; + field_0x3D0 = -1; + field_0x3D4 = 0; + + field_0x3B0 = 0; // fix + field_0x3B4 = 0; // fix + field_0x3B8 = 0; // fix + field_0x3BC = 0; // fix + + field_0x3DE = 0; + field_0x3DF = 0; + field_0x3E0 = 0; + field_0x3E1 = 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -443,6 +452,7 @@ asm dDlst_TimerScrnDraw_c::dDlst_TimerScrnDraw_c() { #include "asm/d/d_timer/__ct__21dDlst_TimerScrnDraw_cFv.s" } #pragma pop +#endif /* 8025DBE0-8025DFBC 258520 03DC+00 1/1 0/0 0/0 .text setHIO__21dDlst_TimerScrnDraw_cFv */ @@ -559,6 +569,11 @@ asm void dDlst_TimerScrnDraw_c::changeNumberTexture(J2DPane* param_0, int param_ #pragma pop /* 8025EECC-8025EEF0 25980C 0024+00 1/1 0/0 0/0 .text getNumber__21dDlst_TimerScrnDraw_cFi */ +#ifndef NONMATCHING +char* dDlst_TimerScrnDraw_c::getNumber(int pIndex) { + return dMeter2Info_getNumberTextureName(pIndex); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -567,6 +582,7 @@ asm void dDlst_TimerScrnDraw_c::getNumber(int param_0) { #include "asm/d/d_timer/getNumber__21dDlst_TimerScrnDraw_cFi.s" } #pragma pop +#endif /* ############################################################################################## */ /* 80454F4C-80454F50 00354C 0004+00 5/5 0/0 0/0 .sdata2 @4124 */ From 6b05cf6a3bd3cc303a5ca6aceef73518740cd155 Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Thu, 22 Dec 2022 16:02:42 -0700 Subject: [PATCH 23/25] dDlst_TimerScrnDraw_c::getNumber --- src/d/d_timer.cpp | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp index 9a54c4226f..a970894bab 100644 --- a/src/d/d_timer.cpp +++ b/src/d/d_timer.cpp @@ -569,20 +569,9 @@ asm void dDlst_TimerScrnDraw_c::changeNumberTexture(J2DPane* param_0, int param_ #pragma pop /* 8025EECC-8025EEF0 25980C 0024+00 1/1 0/0 0/0 .text getNumber__21dDlst_TimerScrnDraw_cFi */ -#ifndef NONMATCHING char* dDlst_TimerScrnDraw_c::getNumber(int pIndex) { return dMeter2Info_getNumberTextureName(pIndex); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDlst_TimerScrnDraw_c::getNumber(int param_0) { - nofralloc -#include "asm/d/d_timer/getNumber__21dDlst_TimerScrnDraw_cFi.s" -} -#pragma pop -#endif /* ############################################################################################## */ /* 80454F4C-80454F50 00354C 0004+00 5/5 0/0 0/0 .sdata2 @4124 */ From 020a4a53105848868db2336b86b23d4e36ec9fc8 Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Thu, 22 Dec 2022 16:12:32 -0700 Subject: [PATCH 24/25] rm types --- src/d/d_timer.cpp | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp index a970894bab..a887623e67 100644 --- a/src/d/d_timer.cpp +++ b/src/d/d_timer.cpp @@ -10,17 +10,6 @@ #include "dolphin/types.h" #include "m_Do/m_Do_lib.h" - -// -// Types: -// - - - -struct J2DAnmLoaderDataBase { - /* 80308A6C */ void load(void const*); -}; - // // Forward References: // From 545e5b2e5005dc3dd8f7dd81f647e28fe1fe0324 Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Thu, 22 Dec 2022 16:54:59 -0700 Subject: [PATCH 25/25] remove asm --- .../d_a_player/checkBombItem__9daPy_py_cFi.s | 19 ------- .../checkWoodShieldEquip__9daPy_py_cFv.s | 16 ------ ...bSubjectNoDraw__9daPy_py_cFP10fopAc_ac_c.s | 23 -------- asm/d/d_timer/_draw__8dTimer_cFv.s | 36 ------------ asm/d/d_timer/dTimer_Create__FP9msg_class.s | 9 --- asm/d/d_timer/dTimer_Delete__FP8dTimer_c.s | 9 --- asm/d/d_timer/dTimer_Draw__FP8dTimer_c.s | 9 --- asm/d/d_timer/dTimer_Execute__FP8dTimer_c.s | 9 --- asm/d/d_timer/dTimer_createGetIn2D__Fl4cXyz.s | 37 ------------ asm/d/d_timer/dTimer_createStart2D__FlUs.s | 29 ---------- asm/d/d_timer/dTimer_createStockTimer__Fv.s | 56 ------------------- .../dTimer_createTimer__FlUlUcUcffff.s | 45 --------------- asm/d/d_timer/dTimer_getRestTimeMs__Fv.s | 24 -------- asm/d/d_timer/dTimer_hide__Fv.s | 23 -------- asm/d/d_timer/dTimer_isReadyFlag__Fv.s | 24 -------- asm/d/d_timer/dTimer_isStart__Fv.s | 24 -------- asm/d/d_timer/dTimer_show__Fv.s | 23 -------- asm/d/d_timer/deleteCheck__8dTimer_cFv.s | 6 -- asm/d/d_timer/deleteRequest__8dTimer_cFv.s | 5 -- asm/d/d_timer/end__8dTimer_cFi.s | 52 ----------------- asm/d/d_timer/getLimitTimeMs__8dTimer_cFv.s | 19 ------- .../getNumber__21dDlst_TimerScrnDraw_cFi.s | 10 ---- asm/d/d_timer/getTimeMs__8dTimer_cFv.s | 26 --------- asm/d/d_timer/isStart__8dTimer_cFv.s | 12 ---- asm/d/d_timer/restart__8dTimer_cFUc.s | 50 ----------------- asm/d/d_timer/stock_start__8dTimer_cFs.s | 12 ---- asm/d/d_timer/stop__8dTimer_cFUc.s | 38 ------------- 27 files changed, 645 deletions(-) delete mode 100644 asm/d/a/d_a_player/checkBombItem__9daPy_py_cFi.s delete mode 100644 asm/d/a/d_a_player/checkWoodShieldEquip__9daPy_py_cFv.s delete mode 100644 asm/d/a/d_a_player/wolfGrabSubjectNoDraw__9daPy_py_cFP10fopAc_ac_c.s delete mode 100644 asm/d/d_timer/_draw__8dTimer_cFv.s delete mode 100644 asm/d/d_timer/dTimer_Create__FP9msg_class.s delete mode 100644 asm/d/d_timer/dTimer_Delete__FP8dTimer_c.s delete mode 100644 asm/d/d_timer/dTimer_Draw__FP8dTimer_c.s delete mode 100644 asm/d/d_timer/dTimer_Execute__FP8dTimer_c.s delete mode 100644 asm/d/d_timer/dTimer_createGetIn2D__Fl4cXyz.s delete mode 100644 asm/d/d_timer/dTimer_createStart2D__FlUs.s delete mode 100644 asm/d/d_timer/dTimer_createStockTimer__Fv.s delete mode 100644 asm/d/d_timer/dTimer_createTimer__FlUlUcUcffff.s delete mode 100644 asm/d/d_timer/dTimer_getRestTimeMs__Fv.s delete mode 100644 asm/d/d_timer/dTimer_hide__Fv.s delete mode 100644 asm/d/d_timer/dTimer_isReadyFlag__Fv.s delete mode 100644 asm/d/d_timer/dTimer_isStart__Fv.s delete mode 100644 asm/d/d_timer/dTimer_show__Fv.s delete mode 100644 asm/d/d_timer/deleteCheck__8dTimer_cFv.s delete mode 100644 asm/d/d_timer/deleteRequest__8dTimer_cFv.s delete mode 100644 asm/d/d_timer/end__8dTimer_cFi.s delete mode 100644 asm/d/d_timer/getLimitTimeMs__8dTimer_cFv.s delete mode 100644 asm/d/d_timer/getNumber__21dDlst_TimerScrnDraw_cFi.s delete mode 100644 asm/d/d_timer/getTimeMs__8dTimer_cFv.s delete mode 100644 asm/d/d_timer/isStart__8dTimer_cFv.s delete mode 100644 asm/d/d_timer/restart__8dTimer_cFUc.s delete mode 100644 asm/d/d_timer/stock_start__8dTimer_cFs.s delete mode 100644 asm/d/d_timer/stop__8dTimer_cFUc.s diff --git a/asm/d/a/d_a_player/checkBombItem__9daPy_py_cFi.s b/asm/d/a/d_a_player/checkBombItem__9daPy_py_cFi.s deleted file mode 100644 index fcec17fd46..0000000000 --- a/asm/d/a/d_a_player/checkBombItem__9daPy_py_cFi.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_8015EA48: -/* 8015EA48 38 A0 00 01 */ li r5, 1 -/* 8015EA4C 7C A6 2B 78 */ mr r6, r5 -/* 8015EA50 38 03 FF 90 */ addi r0, r3, -112 -/* 8015EA54 38 80 FF FF */ li r4, -1 -/* 8015EA58 7C 00 28 10 */ subfc r0, r0, r5 -/* 8015EA5C 7C 04 01 90 */ subfze r0, r4 -/* 8015EA60 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 8015EA64 40 82 00 08 */ bne lbl_8015EA6C -/* 8015EA68 38 C0 00 00 */ li r6, 0 -lbl_8015EA6C: -/* 8015EA6C 54 C0 06 3F */ clrlwi. r0, r6, 0x18 -/* 8015EA70 40 82 00 10 */ bne lbl_8015EA80 -/* 8015EA74 2C 03 00 72 */ cmpwi r3, 0x72 -/* 8015EA78 41 82 00 08 */ beq lbl_8015EA80 -/* 8015EA7C 38 A0 00 00 */ li r5, 0 -lbl_8015EA80: -/* 8015EA80 54 A3 06 3E */ clrlwi r3, r5, 0x18 -/* 8015EA84 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_player/checkWoodShieldEquip__9daPy_py_cFv.s b/asm/d/a/d_a_player/checkWoodShieldEquip__9daPy_py_cFv.s deleted file mode 100644 index fa9c3daccc..0000000000 --- a/asm/d/a/d_a_player/checkWoodShieldEquip__9daPy_py_cFv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_8015F3C4: -/* 8015F3C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8015F3C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8015F3CC 88 63 00 15 */ lbz r3, 0x15(r3) -/* 8015F3D0 38 80 00 01 */ li r4, 1 -/* 8015F3D4 38 03 FF D6 */ addi r0, r3, -42 -/* 8015F3D8 54 00 04 3E */ clrlwi r0, r0, 0x10 -/* 8015F3DC 38 60 FF FF */ li r3, -1 -/* 8015F3E0 7C 00 20 10 */ subfc r0, r0, r4 -/* 8015F3E4 7C 03 01 90 */ subfze r0, r3 -/* 8015F3E8 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 8015F3EC 40 82 00 08 */ bne lbl_8015F3F4 -/* 8015F3F0 38 80 00 00 */ li r4, 0 -lbl_8015F3F4: -/* 8015F3F4 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 8015F3F8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_player/wolfGrabSubjectNoDraw__9daPy_py_cFP10fopAc_ac_c.s b/asm/d/a/d_a_player/wolfGrabSubjectNoDraw__9daPy_py_cFP10fopAc_ac_c.s deleted file mode 100644 index c5fcbeda46..0000000000 --- a/asm/d/a/d_a_player/wolfGrabSubjectNoDraw__9daPy_py_cFP10fopAc_ac_c.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_8015F60C: -/* 8015F60C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8015F610 7C 08 02 A6 */ mflr r0 -/* 8015F614 90 01 00 14 */ stw r0, 0x14(r1) -/* 8015F618 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8015F61C 3B E0 00 00 */ li r31, 0 -/* 8015F620 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8015F624 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8015F628 80 84 5D B4 */ lwz r4, 0x5db4(r4) -/* 8015F62C 80 04 05 74 */ lwz r0, 0x574(r4) -/* 8015F630 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 8015F634 41 82 00 14 */ beq lbl_8015F648 -/* 8015F638 4B FF FF 25 */ bl linkGrabSubjectNoDraw__9daPy_py_cFP10fopAc_ac_c -/* 8015F63C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8015F640 41 82 00 08 */ beq lbl_8015F648 -/* 8015F644 3B E0 00 01 */ li r31, 1 -lbl_8015F648: -/* 8015F648 7F E3 FB 78 */ mr r3, r31 -/* 8015F64C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8015F650 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8015F654 7C 08 03 A6 */ mtlr r0 -/* 8015F658 38 21 00 10 */ addi r1, r1, 0x10 -/* 8015F65C 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/_draw__8dTimer_cFv.s b/asm/d/d_timer/_draw__8dTimer_cFv.s deleted file mode 100644 index 43b5d69091..0000000000 --- a/asm/d/d_timer/_draw__8dTimer_cFv.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_8025D33C: -/* 8025D33C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025D340 7C 08 02 A6 */ mflr r0 -/* 8025D344 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025D348 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025D34C 7C 7F 1B 78 */ mr r31, r3 -/* 8025D350 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8025D354 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8025D358 88 03 5E B5 */ lbz r0, 0x5eb5(r3) -/* 8025D35C 28 00 00 00 */ cmplwi r0, 0 -/* 8025D360 40 82 00 20 */ bne lbl_8025D380 -/* 8025D364 4B FD AE C9 */ bl getStatus__12dMsgObject_cFv -/* 8025D368 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 8025D36C 20 60 00 01 */ subfic r3, r0, 1 -/* 8025D370 30 03 FF FF */ addic r0, r3, -1 -/* 8025D374 7C 00 19 10 */ subfe r0, r0, r3 -/* 8025D378 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 8025D37C 41 82 00 0C */ beq lbl_8025D388 -lbl_8025D380: -/* 8025D380 38 60 00 01 */ li r3, 1 -/* 8025D384 48 00 00 24 */ b lbl_8025D3A8 -lbl_8025D388: -/* 8025D388 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8025D38C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8025D390 38 63 5F 64 */ addi r3, r3, 0x5f64 -/* 8025D394 38 83 01 B4 */ addi r4, r3, 0x1b4 -/* 8025D398 38 A3 01 B8 */ addi r5, r3, 0x1b8 -/* 8025D39C 80 DF 00 FC */ lwz r6, 0xfc(r31) -/* 8025D3A0 4B DF 93 F5 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c -/* 8025D3A4 38 60 00 01 */ li r3, 1 -lbl_8025D3A8: -/* 8025D3A8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025D3AC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025D3B0 7C 08 03 A6 */ mtlr r0 -/* 8025D3B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025D3B8 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/dTimer_Create__FP9msg_class.s b/asm/d/d_timer/dTimer_Create__FP9msg_class.s deleted file mode 100644 index 3903844761..0000000000 --- a/asm/d/d_timer/dTimer_Create__FP9msg_class.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80260F6C: -/* 80260F6C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80260F70 7C 08 02 A6 */ mflr r0 -/* 80260F74 90 01 00 14 */ stw r0, 0x14(r1) -/* 80260F78 4B FF BA 95 */ bl _create__8dTimer_cFv -/* 80260F7C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80260F80 7C 08 03 A6 */ mtlr r0 -/* 80260F84 38 21 00 10 */ addi r1, r1, 0x10 -/* 80260F88 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/dTimer_Delete__FP8dTimer_c.s b/asm/d/d_timer/dTimer_Delete__FP8dTimer_c.s deleted file mode 100644 index 31eefdc49e..0000000000 --- a/asm/d/d_timer/dTimer_Delete__FP8dTimer_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80260F4C: -/* 80260F4C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80260F50 7C 08 02 A6 */ mflr r0 -/* 80260F54 90 01 00 14 */ stw r0, 0x14(r1) -/* 80260F58 4B FF C4 65 */ bl _delete__8dTimer_cFv -/* 80260F5C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80260F60 7C 08 03 A6 */ mtlr r0 -/* 80260F64 38 21 00 10 */ addi r1, r1, 0x10 -/* 80260F68 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/dTimer_Draw__FP8dTimer_c.s b/asm/d/d_timer/dTimer_Draw__FP8dTimer_c.s deleted file mode 100644 index 5ec8f86c70..0000000000 --- a/asm/d/d_timer/dTimer_Draw__FP8dTimer_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80260F04: -/* 80260F04 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80260F08 7C 08 02 A6 */ mflr r0 -/* 80260F0C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80260F10 4B FF C4 2D */ bl _draw__8dTimer_cFv -/* 80260F14 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80260F18 7C 08 03 A6 */ mtlr r0 -/* 80260F1C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80260F20 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/dTimer_Execute__FP8dTimer_c.s b/asm/d/d_timer/dTimer_Execute__FP8dTimer_c.s deleted file mode 100644 index 0e2487c1eb..0000000000 --- a/asm/d/d_timer/dTimer_Execute__FP8dTimer_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80260F24: -/* 80260F24 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80260F28 7C 08 02 A6 */ mflr r0 -/* 80260F2C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80260F30 4B FF BF D5 */ bl _execute__8dTimer_cFv -/* 80260F34 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80260F38 7C 08 03 A6 */ mtlr r0 -/* 80260F3C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80260F40 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/dTimer_createGetIn2D__Fl4cXyz.s b/asm/d/d_timer/dTimer_createGetIn2D__Fl4cXyz.s deleted file mode 100644 index 4fcbdc3bfb..0000000000 --- a/asm/d/d_timer/dTimer_createGetIn2D__Fl4cXyz.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_80261100: -/* 80261100 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80261104 7C 08 02 A6 */ mflr r0 -/* 80261108 90 01 00 34 */ stw r0, 0x34(r1) -/* 8026110C 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 80261110 93 C1 00 28 */ stw r30, 0x28(r1) -/* 80261114 7C 9E 23 78 */ mr r30, r4 -/* 80261118 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8026111C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80261120 3B E3 0F 38 */ addi r31, r3, 0xf38 -/* 80261124 7F E3 FB 78 */ mr r3, r31 -/* 80261128 4B DC BA B5 */ bl getTimerPtr__14dComIfG_play_cFv -/* 8026112C 28 03 00 00 */ cmplwi r3, 0 -/* 80261130 41 82 00 3C */ beq lbl_8026116C -/* 80261134 7F C3 F3 78 */ mr r3, r30 -/* 80261138 38 81 00 14 */ addi r4, r1, 0x14 -/* 8026113C 4B DB 41 D5 */ bl mDoLib_project__FP3VecP3Vec -/* 80261140 C0 01 00 14 */ lfs f0, 0x14(r1) -/* 80261144 D0 01 00 08 */ stfs f0, 8(r1) -/* 80261148 C0 01 00 18 */ lfs f0, 0x18(r1) -/* 8026114C D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80261150 C0 01 00 1C */ lfs f0, 0x1c(r1) -/* 80261154 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80261158 7F E3 FB 78 */ mr r3, r31 -/* 8026115C 4B DC BA 81 */ bl getTimerPtr__14dComIfG_play_cFv -/* 80261160 38 81 00 08 */ addi r4, r1, 8 -/* 80261164 48 00 02 79 */ bl createGetIn__8dTimer_cF4cXyz -/* 80261168 48 00 00 08 */ b lbl_80261170 -lbl_8026116C: -/* 8026116C 38 60 00 00 */ li r3, 0 -lbl_80261170: -/* 80261170 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 80261174 83 C1 00 28 */ lwz r30, 0x28(r1) -/* 80261178 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8026117C 7C 08 03 A6 */ mtlr r0 -/* 80261180 38 21 00 30 */ addi r1, r1, 0x30 -/* 80261184 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/dTimer_createStart2D__FlUs.s b/asm/d/d_timer/dTimer_createStart2D__FlUs.s deleted file mode 100644 index 14aa760253..0000000000 --- a/asm/d/d_timer/dTimer_createStart2D__FlUs.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_80261188: -/* 80261188 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8026118C 7C 08 02 A6 */ mflr r0 -/* 80261190 90 01 00 14 */ stw r0, 0x14(r1) -/* 80261194 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80261198 93 C1 00 08 */ stw r30, 8(r1) -/* 8026119C 7C 9E 23 78 */ mr r30, r4 -/* 802611A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802611A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802611A8 3B E3 0F 38 */ addi r31, r3, 0xf38 -/* 802611AC 7F E3 FB 78 */ mr r3, r31 -/* 802611B0 4B DC BA 2D */ bl getTimerPtr__14dComIfG_play_cFv -/* 802611B4 28 03 00 00 */ cmplwi r3, 0 -/* 802611B8 41 82 00 1C */ beq lbl_802611D4 -/* 802611BC 7F E3 FB 78 */ mr r3, r31 -/* 802611C0 4B DC BA 1D */ bl getTimerPtr__14dComIfG_play_cFv -/* 802611C4 80 63 00 FC */ lwz r3, 0xfc(r3) -/* 802611C8 7F C4 F3 78 */ mr r4, r30 -/* 802611CC 4B FF F3 A9 */ bl createStart__21dDlst_TimerScrnDraw_cFUs -/* 802611D0 48 00 00 08 */ b lbl_802611D8 -lbl_802611D4: -/* 802611D4 38 60 00 00 */ li r3, 0 -lbl_802611D8: -/* 802611D8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802611DC 83 C1 00 08 */ lwz r30, 8(r1) -/* 802611E0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802611E4 7C 08 03 A6 */ mtlr r0 -/* 802611E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802611EC 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/dTimer_createStockTimer__Fv.s b/asm/d/d_timer/dTimer_createStockTimer__Fv.s deleted file mode 100644 index 683b3d6c38..0000000000 --- a/asm/d/d_timer/dTimer_createStockTimer__Fv.s +++ /dev/null @@ -1,56 +0,0 @@ -lbl_80261034: -/* 80261034 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80261038 7C 08 02 A6 */ mflr r0 -/* 8026103C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80261040 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80261044 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80261048 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8026104C 3B E3 0F 38 */ addi r31, r3, 0xf38 -/* 80261050 7F E3 FB 78 */ mr r3, r31 -/* 80261054 4B DC BB 69 */ bl getTimerMode__14dComIfG_play_cFv -/* 80261058 2C 03 FF FF */ cmpwi r3, -1 -/* 8026105C 41 82 00 8C */ beq lbl_802610E8 -/* 80261060 7F E3 FB 78 */ mr r3, r31 -/* 80261064 4B DC BB 59 */ bl getTimerMode__14dComIfG_play_cFv -/* 80261068 2C 03 00 03 */ cmpwi r3, 3 -/* 8026106C 41 82 00 14 */ beq lbl_80261080 -/* 80261070 7F E3 FB 78 */ mr r3, r31 -/* 80261074 4B DC BB 49 */ bl getTimerMode__14dComIfG_play_cFv -/* 80261078 2C 03 00 04 */ cmpwi r3, 4 -/* 8026107C 40 82 00 34 */ bne lbl_802610B0 -lbl_80261080: -/* 80261080 38 7F 3E C8 */ addi r3, r31, 0x3ec8 -/* 80261084 3C 80 80 3A */ lis r4, d_d_timer__stringBase0@ha /* 0x8039A3D8@ha */ -/* 80261088 38 84 A3 D8 */ addi r4, r4, d_d_timer__stringBase0@l /* 0x8039A3D8@l */ -/* 8026108C 38 84 00 A4 */ addi r4, r4, 0xa4 -/* 80261090 48 10 79 05 */ bl strcmp -/* 80261094 2C 03 00 00 */ cmpwi r3, 0 -/* 80261098 41 82 00 18 */ beq lbl_802610B0 -/* 8026109C 7F E3 FB 78 */ mr r3, r31 -/* 802610A0 38 80 FF FF */ li r4, -1 -/* 802610A4 4B DC BB 11 */ bl setTimerMode__14dComIfG_play_cFi -/* 802610A8 38 60 FF FF */ li r3, -1 -/* 802610AC 48 00 00 40 */ b lbl_802610EC -lbl_802610B0: -/* 802610B0 7F E3 FB 78 */ mr r3, r31 -/* 802610B4 4B DC BB 19 */ bl getTimerType__14dComIfG_play_cFv -/* 802610B8 7C 66 1B 78 */ mr r6, r3 -/* 802610BC 38 60 03 15 */ li r3, 0x315 -/* 802610C0 38 80 00 0A */ li r4, 0xa -/* 802610C4 38 A0 00 00 */ li r5, 0 -/* 802610C8 38 E0 00 00 */ li r7, 0 -/* 802610CC C0 22 B5 A0 */ lfs f1, lit_5544(r2) -/* 802610D0 C0 42 B5 A4 */ lfs f2, lit_5545(r2) -/* 802610D4 C0 62 B5 A8 */ lfs f3, lit_5546(r2) -/* 802610D8 C0 82 B5 AC */ lfs f4, lit_5547(r2) -/* 802610DC 39 00 00 00 */ li r8, 0 -/* 802610E0 4B DB EB E1 */ bl fop_Timer_create__FsUcUlUcUcffffPFPv_i -/* 802610E4 48 00 00 08 */ b lbl_802610EC -lbl_802610E8: -/* 802610E8 38 60 FF FF */ li r3, -1 -lbl_802610EC: -/* 802610EC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802610F0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802610F4 7C 08 03 A6 */ mtlr r0 -/* 802610F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802610FC 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/dTimer_createTimer__FlUlUcUcffff.s b/asm/d/d_timer/dTimer_createTimer__FlUlUcUcffff.s deleted file mode 100644 index 72026ee310..0000000000 --- a/asm/d/d_timer/dTimer_createTimer__FlUlUcUcffff.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_80260F8C: -/* 80260F8C 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80260F90 7C 08 02 A6 */ mflr r0 -/* 80260F94 90 01 00 44 */ stw r0, 0x44(r1) -/* 80260F98 39 61 00 40 */ addi r11, r1, 0x40 -/* 80260F9C 48 10 11 A5 */ bl _savefpr_28 -/* 80260FA0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80260FA4 48 10 12 35 */ bl _savegpr_28 -/* 80260FA8 7C 7C 1B 78 */ mr r28, r3 -/* 80260FAC 7C 9D 23 78 */ mr r29, r4 -/* 80260FB0 7C BE 2B 78 */ mr r30, r5 -/* 80260FB4 7C DF 33 78 */ mr r31, r6 -/* 80260FB8 FF 80 08 90 */ fmr f28, f1 -/* 80260FBC FF A0 10 90 */ fmr f29, f2 -/* 80260FC0 FF C0 18 90 */ fmr f30, f3 -/* 80260FC4 FF E0 20 90 */ fmr f31, f4 -/* 80260FC8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80260FCC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80260FD0 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80260FD4 4B DC BB E9 */ bl getTimerMode__14dComIfG_play_cFv -/* 80260FD8 2C 03 FF FF */ cmpwi r3, -1 -/* 80260FDC 40 82 00 34 */ bne lbl_80261010 -/* 80260FE0 38 60 03 15 */ li r3, 0x315 -/* 80260FE4 57 84 06 3E */ clrlwi r4, r28, 0x18 -/* 80260FE8 7F A5 EB 78 */ mr r5, r29 -/* 80260FEC 7F C6 F3 78 */ mr r6, r30 -/* 80260FF0 7F E7 FB 78 */ mr r7, r31 -/* 80260FF4 FC 20 E0 90 */ fmr f1, f28 -/* 80260FF8 FC 40 E8 90 */ fmr f2, f29 -/* 80260FFC FC 60 F0 90 */ fmr f3, f30 -/* 80261000 FC 80 F8 90 */ fmr f4, f31 -/* 80261004 39 00 00 00 */ li r8, 0 -/* 80261008 4B DB EC B9 */ bl fop_Timer_create__FsUcUlUcUcffffPFPv_i -/* 8026100C 48 00 00 08 */ b lbl_80261014 -lbl_80261010: -/* 80261010 38 60 FF FF */ li r3, -1 -lbl_80261014: -/* 80261014 39 61 00 40 */ addi r11, r1, 0x40 -/* 80261018 48 10 11 75 */ bl _restfpr_28 -/* 8026101C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80261020 48 10 12 05 */ bl _restgpr_28 -/* 80261024 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80261028 7C 08 03 A6 */ mtlr r0 -/* 8026102C 38 21 00 40 */ addi r1, r1, 0x40 -/* 80261030 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/dTimer_getRestTimeMs__Fv.s b/asm/d/d_timer/dTimer_getRestTimeMs__Fv.s deleted file mode 100644 index b8815c3970..0000000000 --- a/asm/d/d_timer/dTimer_getRestTimeMs__Fv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_80261244: -/* 80261244 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80261248 7C 08 02 A6 */ mflr r0 -/* 8026124C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80261250 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80261254 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80261258 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8026125C 3B E3 0F 38 */ addi r31, r3, 0xf38 -/* 80261260 7F E3 FB 78 */ mr r3, r31 -/* 80261264 4B DC B9 79 */ bl getTimerPtr__14dComIfG_play_cFv -/* 80261268 28 03 00 00 */ cmplwi r3, 0 -/* 8026126C 41 82 00 14 */ beq lbl_80261280 -/* 80261270 7F E3 FB 78 */ mr r3, r31 -/* 80261274 4B DC B9 69 */ bl getTimerPtr__14dComIfG_play_cFv -/* 80261278 4B FF C8 25 */ bl getRestTimeMs__8dTimer_cFv -/* 8026127C 48 00 00 08 */ b lbl_80261284 -lbl_80261280: -/* 80261280 38 60 00 00 */ li r3, 0 -lbl_80261284: -/* 80261284 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80261288 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8026128C 7C 08 03 A6 */ mtlr r0 -/* 80261290 38 21 00 10 */ addi r1, r1, 0x10 -/* 80261294 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/dTimer_hide__Fv.s b/asm/d/d_timer/dTimer_hide__Fv.s deleted file mode 100644 index 2a002deeaf..0000000000 --- a/asm/d/d_timer/dTimer_hide__Fv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_802612EC: -/* 802612EC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802612F0 7C 08 02 A6 */ mflr r0 -/* 802612F4 90 01 00 14 */ stw r0, 0x14(r1) -/* 802612F8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802612FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80261300 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80261304 3B E3 0F 38 */ addi r31, r3, 0xf38 -/* 80261308 7F E3 FB 78 */ mr r3, r31 -/* 8026130C 4B DC B8 D1 */ bl getTimerPtr__14dComIfG_play_cFv -/* 80261310 28 03 00 00 */ cmplwi r3, 0 -/* 80261314 41 82 00 18 */ beq lbl_8026132C -/* 80261318 7F E3 FB 78 */ mr r3, r31 -/* 8026131C 4B DC B8 C1 */ bl getTimerPtr__14dComIfG_play_cFv -/* 80261320 38 00 00 00 */ li r0, 0 -/* 80261324 80 63 00 FC */ lwz r3, 0xfc(r3) -/* 80261328 98 03 03 E1 */ stb r0, 0x3e1(r3) -lbl_8026132C: -/* 8026132C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80261330 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80261334 7C 08 03 A6 */ mtlr r0 -/* 80261338 38 21 00 10 */ addi r1, r1, 0x10 -/* 8026133C 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/dTimer_isReadyFlag__Fv.s b/asm/d/d_timer/dTimer_isReadyFlag__Fv.s deleted file mode 100644 index faec40ede2..0000000000 --- a/asm/d/d_timer/dTimer_isReadyFlag__Fv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_80261340: -/* 80261340 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80261344 7C 08 02 A6 */ mflr r0 -/* 80261348 90 01 00 14 */ stw r0, 0x14(r1) -/* 8026134C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80261350 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80261354 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80261358 3B E3 0F 38 */ addi r31, r3, 0xf38 -/* 8026135C 7F E3 FB 78 */ mr r3, r31 -/* 80261360 4B DC B8 7D */ bl getTimerPtr__14dComIfG_play_cFv -/* 80261364 28 03 00 00 */ cmplwi r3, 0 -/* 80261368 41 82 00 14 */ beq lbl_8026137C -/* 8026136C 7F E3 FB 78 */ mr r3, r31 -/* 80261370 4B DC B8 6D */ bl getTimerPtr__14dComIfG_play_cFv -/* 80261374 88 63 01 6E */ lbz r3, 0x16e(r3) -/* 80261378 48 00 00 08 */ b lbl_80261380 -lbl_8026137C: -/* 8026137C 38 60 00 00 */ li r3, 0 -lbl_80261380: -/* 80261380 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80261384 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80261388 7C 08 03 A6 */ mtlr r0 -/* 8026138C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80261390 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/dTimer_isStart__Fv.s b/asm/d/d_timer/dTimer_isStart__Fv.s deleted file mode 100644 index 677db87766..0000000000 --- a/asm/d/d_timer/dTimer_isStart__Fv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_802611F0: -/* 802611F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802611F4 7C 08 02 A6 */ mflr r0 -/* 802611F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802611FC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80261200 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80261204 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80261208 3B E3 0F 38 */ addi r31, r3, 0xf38 -/* 8026120C 7F E3 FB 78 */ mr r3, r31 -/* 80261210 4B DC B9 CD */ bl getTimerPtr__14dComIfG_play_cFv -/* 80261214 28 03 00 00 */ cmplwi r3, 0 -/* 80261218 41 82 00 14 */ beq lbl_8026122C -/* 8026121C 7F E3 FB 78 */ mr r3, r31 -/* 80261220 4B DC B9 BD */ bl getTimerPtr__14dComIfG_play_cFv -/* 80261224 4B FF C8 ED */ bl isStart__8dTimer_cFv -/* 80261228 48 00 00 08 */ b lbl_80261230 -lbl_8026122C: -/* 8026122C 38 60 00 00 */ li r3, 0 -lbl_80261230: -/* 80261230 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80261234 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80261238 7C 08 03 A6 */ mtlr r0 -/* 8026123C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80261240 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/dTimer_show__Fv.s b/asm/d/d_timer/dTimer_show__Fv.s deleted file mode 100644 index 05950e0b8c..0000000000 --- a/asm/d/d_timer/dTimer_show__Fv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80261298: -/* 80261298 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8026129C 7C 08 02 A6 */ mflr r0 -/* 802612A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802612A4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802612A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802612AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802612B0 3B E3 0F 38 */ addi r31, r3, 0xf38 -/* 802612B4 7F E3 FB 78 */ mr r3, r31 -/* 802612B8 4B DC B9 25 */ bl getTimerPtr__14dComIfG_play_cFv -/* 802612BC 28 03 00 00 */ cmplwi r3, 0 -/* 802612C0 41 82 00 18 */ beq lbl_802612D8 -/* 802612C4 7F E3 FB 78 */ mr r3, r31 -/* 802612C8 4B DC B9 15 */ bl getTimerPtr__14dComIfG_play_cFv -/* 802612CC 38 00 00 01 */ li r0, 1 -/* 802612D0 80 63 00 FC */ lwz r3, 0xfc(r3) -/* 802612D4 98 03 03 E1 */ stb r0, 0x3e1(r3) -lbl_802612D8: -/* 802612D8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802612DC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802612E0 7C 08 03 A6 */ mtlr r0 -/* 802612E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802612E8 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/deleteCheck__8dTimer_cFv.s b/asm/d/d_timer/deleteCheck__8dTimer_cFv.s deleted file mode 100644 index 5b84dbd6d7..0000000000 --- a/asm/d/d_timer/deleteCheck__8dTimer_cFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_8025D524: -/* 8025D524 88 03 01 6C */ lbz r0, 0x16c(r3) -/* 8025D528 20 00 00 07 */ subfic r0, r0, 7 -/* 8025D52C 7C 00 00 34 */ cntlzw r0, r0 -/* 8025D530 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -/* 8025D534 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/deleteRequest__8dTimer_cFv.s b/asm/d/d_timer/deleteRequest__8dTimer_cFv.s deleted file mode 100644 index d84587b370..0000000000 --- a/asm/d/d_timer/deleteRequest__8dTimer_cFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_8025D9E0: -/* 8025D9E0 38 00 00 08 */ li r0, 8 -/* 8025D9E4 98 03 01 6C */ stb r0, 0x16c(r3) -/* 8025D9E8 38 60 00 01 */ li r3, 1 -/* 8025D9EC 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/end__8dTimer_cFi.s b/asm/d/d_timer/end__8dTimer_cFi.s deleted file mode 100644 index d404d711fe..0000000000 --- a/asm/d/d_timer/end__8dTimer_cFi.s +++ /dev/null @@ -1,52 +0,0 @@ -lbl_8025D920: -/* 8025D920 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025D924 7C 08 02 A6 */ mflr r0 -/* 8025D928 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025D92C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025D930 93 C1 00 08 */ stw r30, 8(r1) -/* 8025D934 7C 7E 1B 78 */ mr r30, r3 -/* 8025D938 7C 9F 23 78 */ mr r31, r4 -/* 8025D93C 88 03 01 6C */ lbz r0, 0x16c(r3) -/* 8025D940 28 00 00 04 */ cmplwi r0, 4 -/* 8025D944 41 82 00 0C */ beq lbl_8025D950 -/* 8025D948 38 60 00 00 */ li r3, 0 -/* 8025D94C 48 00 00 7C */ b lbl_8025D9C8 -lbl_8025D950: -/* 8025D950 4B DD 4E B5 */ bl getTime__11dLib_time_cFv -/* 8025D954 90 9E 01 24 */ stw r4, 0x124(r30) -/* 8025D958 90 7E 01 20 */ stw r3, 0x120(r30) -/* 8025D95C 38 00 00 06 */ li r0, 6 -/* 8025D960 98 1E 01 6C */ stb r0, 0x16c(r30) -/* 8025D964 80 BE 01 20 */ lwz r5, 0x120(r30) -/* 8025D968 80 9E 01 24 */ lwz r4, 0x124(r30) -/* 8025D96C 80 1E 01 10 */ lwz r0, 0x110(r30) -/* 8025D970 80 7E 01 14 */ lwz r3, 0x114(r30) -/* 8025D974 7C 83 20 10 */ subfc r4, r3, r4 -/* 8025D978 7C A0 29 10 */ subfe r5, r0, r5 -/* 8025D97C 80 1E 01 38 */ lwz r0, 0x138(r30) -/* 8025D980 80 7E 01 3C */ lwz r3, 0x13c(r30) -/* 8025D984 7C 83 20 10 */ subfc r4, r3, r4 -/* 8025D988 7C 60 29 10 */ subfe r3, r0, r5 -/* 8025D98C 3C A0 80 00 */ lis r5, 0x8000 /* 0x800000F8@ha */ -/* 8025D990 80 05 00 F8 */ lwz r0, 0x00F8(r5) /* 0x800000F8@l */ -/* 8025D994 54 05 F0 BE */ srwi r5, r0, 2 -/* 8025D998 38 00 03 E8 */ li r0, 0x3e8 -/* 8025D99C 7C C5 03 96 */ divwu r6, r5, r0 -/* 8025D9A0 38 A0 00 00 */ li r5, 0 -/* 8025D9A4 48 10 49 81 */ bl __div2i -/* 8025D9A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8025D9AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8025D9B0 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 8025D9B4 4B DC F1 E1 */ bl setTimerNowTimeMs__14dComIfG_play_cFi -/* 8025D9B8 2C 1F FF FF */ cmpwi r31, -1 -/* 8025D9BC 41 82 00 08 */ beq lbl_8025D9C4 -/* 8025D9C0 93 FE 01 58 */ stw r31, 0x158(r30) -lbl_8025D9C4: -/* 8025D9C4 38 60 00 01 */ li r3, 1 -lbl_8025D9C8: -/* 8025D9C8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025D9CC 83 C1 00 08 */ lwz r30, 8(r1) -/* 8025D9D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025D9D4 7C 08 03 A6 */ mtlr r0 -/* 8025D9D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025D9DC 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/getLimitTimeMs__8dTimer_cFv.s b/asm/d/d_timer/getLimitTimeMs__8dTimer_cFv.s deleted file mode 100644 index b50c6dcb68..0000000000 --- a/asm/d/d_timer/getLimitTimeMs__8dTimer_cFv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_8025DA54: -/* 8025DA54 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025DA58 7C 08 02 A6 */ mflr r0 -/* 8025DA5C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025DA60 80 A3 01 40 */ lwz r5, 0x140(r3) -/* 8025DA64 80 83 01 44 */ lwz r4, 0x144(r3) -/* 8025DA68 3C 60 80 00 */ lis r3, 0x8000 /* 0x800000F8@ha */ -/* 8025DA6C 80 03 00 F8 */ lwz r0, 0x00F8(r3) /* 0x800000F8@l */ -/* 8025DA70 54 03 F0 BE */ srwi r3, r0, 2 -/* 8025DA74 38 00 03 E8 */ li r0, 0x3e8 -/* 8025DA78 7C C3 03 96 */ divwu r6, r3, r0 -/* 8025DA7C 7C A3 2B 78 */ mr r3, r5 -/* 8025DA80 38 A0 00 00 */ li r5, 0 -/* 8025DA84 48 10 48 A1 */ bl __div2i -/* 8025DA88 7C 83 23 78 */ mr r3, r4 -/* 8025DA8C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025DA90 7C 08 03 A6 */ mtlr r0 -/* 8025DA94 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025DA98 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/getNumber__21dDlst_TimerScrnDraw_cFi.s b/asm/d/d_timer/getNumber__21dDlst_TimerScrnDraw_cFi.s deleted file mode 100644 index 17b03b139e..0000000000 --- a/asm/d/d_timer/getNumber__21dDlst_TimerScrnDraw_cFi.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_8025EECC: -/* 8025EECC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025EED0 7C 08 02 A6 */ mflr r0 -/* 8025EED4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025EED8 7C 83 23 78 */ mr r3, r4 -/* 8025EEDC 4B FB F3 ED */ bl dMeter2Info_getNumberTextureName__Fi -/* 8025EEE0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025EEE4 7C 08 03 A6 */ mtlr r0 -/* 8025EEE8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025EEEC 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/getTimeMs__8dTimer_cFv.s b/asm/d/d_timer/getTimeMs__8dTimer_cFv.s deleted file mode 100644 index 15e441c9e5..0000000000 --- a/asm/d/d_timer/getTimeMs__8dTimer_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_8025D9F0: -/* 8025D9F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025D9F4 7C 08 02 A6 */ mflr r0 -/* 8025D9F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025D9FC 80 A3 01 18 */ lwz r5, 0x118(r3) -/* 8025DA00 80 C3 01 1C */ lwz r6, 0x11c(r3) -/* 8025DA04 80 03 01 10 */ lwz r0, 0x110(r3) -/* 8025DA08 80 83 01 14 */ lwz r4, 0x114(r3) -/* 8025DA0C 7C 84 30 10 */ subfc r4, r4, r6 -/* 8025DA10 7C A0 29 10 */ subfe r5, r0, r5 -/* 8025DA14 80 03 01 38 */ lwz r0, 0x138(r3) -/* 8025DA18 80 63 01 3C */ lwz r3, 0x13c(r3) -/* 8025DA1C 7C 83 20 10 */ subfc r4, r3, r4 -/* 8025DA20 7C 60 29 10 */ subfe r3, r0, r5 -/* 8025DA24 3C A0 80 00 */ lis r5, 0x8000 /* 0x800000F8@ha */ -/* 8025DA28 80 05 00 F8 */ lwz r0, 0x00F8(r5) /* 0x800000F8@l */ -/* 8025DA2C 54 05 F0 BE */ srwi r5, r0, 2 -/* 8025DA30 38 00 03 E8 */ li r0, 0x3e8 -/* 8025DA34 7C C5 03 96 */ divwu r6, r5, r0 -/* 8025DA38 38 A0 00 00 */ li r5, 0 -/* 8025DA3C 48 10 48 E9 */ bl __div2i -/* 8025DA40 7C 83 23 78 */ mr r3, r4 -/* 8025DA44 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025DA48 7C 08 03 A6 */ mtlr r0 -/* 8025DA4C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025DA50 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/isStart__8dTimer_cFv.s b/asm/d/d_timer/isStart__8dTimer_cFv.s deleted file mode 100644 index 534e2a687e..0000000000 --- a/asm/d/d_timer/isStart__8dTimer_cFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_8025DB10: -/* 8025DB10 88 03 01 6A */ lbz r0, 0x16a(r3) -/* 8025DB14 28 00 00 01 */ cmplwi r0, 1 -/* 8025DB18 41 82 00 18 */ beq lbl_8025DB30 -/* 8025DB1C 88 03 01 6C */ lbz r0, 0x16c(r3) -/* 8025DB20 28 00 00 04 */ cmplwi r0, 4 -/* 8025DB24 40 82 00 0C */ bne lbl_8025DB30 -/* 8025DB28 38 60 00 01 */ li r3, 1 -/* 8025DB2C 4E 80 00 20 */ blr -lbl_8025DB30: -/* 8025DB30 38 60 00 00 */ li r3, 0 -/* 8025DB34 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/restart__8dTimer_cFUc.s b/asm/d/d_timer/restart__8dTimer_cFUc.s deleted file mode 100644 index de2e7fc04e..0000000000 --- a/asm/d/d_timer/restart__8dTimer_cFUc.s +++ /dev/null @@ -1,50 +0,0 @@ -lbl_8025D86C: -/* 8025D86C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025D870 7C 08 02 A6 */ mflr r0 -/* 8025D874 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025D878 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025D87C 7C 7F 1B 78 */ mr r31, r3 -/* 8025D880 88 03 01 6A */ lbz r0, 0x16a(r3) -/* 8025D884 28 00 00 01 */ cmplwi r0, 1 -/* 8025D888 40 82 00 14 */ bne lbl_8025D89C -/* 8025D88C 88 7F 01 6B */ lbz r3, 0x16b(r31) -/* 8025D890 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 8025D894 7C 03 00 40 */ cmplw r3, r0 -/* 8025D898 41 82 00 0C */ beq lbl_8025D8A4 -lbl_8025D89C: -/* 8025D89C 38 60 00 00 */ li r3, 0 -/* 8025D8A0 48 00 00 6C */ b lbl_8025D90C -lbl_8025D8A4: -/* 8025D8A4 88 1F 01 6C */ lbz r0, 0x16c(r31) -/* 8025D8A8 28 00 00 04 */ cmplwi r0, 4 -/* 8025D8AC 41 82 00 14 */ beq lbl_8025D8C0 -/* 8025D8B0 28 00 00 02 */ cmplwi r0, 2 -/* 8025D8B4 41 82 00 0C */ beq lbl_8025D8C0 -/* 8025D8B8 38 60 00 00 */ li r3, 0 -/* 8025D8BC 48 00 00 50 */ b lbl_8025D90C -lbl_8025D8C0: -/* 8025D8C0 4B DD 4F 45 */ bl getTime__11dLib_time_cFv -/* 8025D8C4 90 9F 01 1C */ stw r4, 0x11c(r31) -/* 8025D8C8 90 7F 01 18 */ stw r3, 0x118(r31) -/* 8025D8CC 80 DF 01 38 */ lwz r6, 0x138(r31) -/* 8025D8D0 80 FF 01 3C */ lwz r7, 0x13c(r31) -/* 8025D8D4 80 9F 01 18 */ lwz r4, 0x118(r31) -/* 8025D8D8 80 BF 01 1C */ lwz r5, 0x11c(r31) -/* 8025D8DC 80 1F 01 30 */ lwz r0, 0x130(r31) -/* 8025D8E0 80 7F 01 34 */ lwz r3, 0x134(r31) -/* 8025D8E4 7C 63 28 10 */ subfc r3, r3, r5 -/* 8025D8E8 7C 00 21 10 */ subfe r0, r0, r4 -/* 8025D8EC 7C 67 18 14 */ addc r3, r7, r3 -/* 8025D8F0 7C 06 01 14 */ adde r0, r6, r0 -/* 8025D8F4 90 7F 01 3C */ stw r3, 0x13c(r31) -/* 8025D8F8 90 1F 01 38 */ stw r0, 0x138(r31) -/* 8025D8FC 38 00 00 00 */ li r0, 0 -/* 8025D900 98 1F 01 6A */ stb r0, 0x16a(r31) -/* 8025D904 98 1F 01 6B */ stb r0, 0x16b(r31) -/* 8025D908 38 60 00 01 */ li r3, 1 -lbl_8025D90C: -/* 8025D90C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025D910 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025D914 7C 08 03 A6 */ mtlr r0 -/* 8025D918 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025D91C 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/stock_start__8dTimer_cFs.s b/asm/d/d_timer/stock_start__8dTimer_cFs.s deleted file mode 100644 index 6cf455b9c5..0000000000 --- a/asm/d/d_timer/stock_start__8dTimer_cFs.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_8025D7C0: -/* 8025D7C0 88 03 01 6C */ lbz r0, 0x16c(r3) -/* 8025D7C4 28 00 00 00 */ cmplwi r0, 0 -/* 8025D7C8 40 82 00 18 */ bne lbl_8025D7E0 -/* 8025D7CC B0 83 01 68 */ sth r4, 0x168(r3) -/* 8025D7D0 38 00 00 05 */ li r0, 5 -/* 8025D7D4 98 03 01 6C */ stb r0, 0x16c(r3) -/* 8025D7D8 38 60 00 01 */ li r3, 1 -/* 8025D7DC 4E 80 00 20 */ blr -lbl_8025D7E0: -/* 8025D7E0 38 60 00 00 */ li r3, 0 -/* 8025D7E4 4E 80 00 20 */ blr diff --git a/asm/d/d_timer/stop__8dTimer_cFUc.s b/asm/d/d_timer/stop__8dTimer_cFUc.s deleted file mode 100644 index 22d17e34c1..0000000000 --- a/asm/d/d_timer/stop__8dTimer_cFUc.s +++ /dev/null @@ -1,38 +0,0 @@ -lbl_8025D7E8: -/* 8025D7E8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025D7EC 7C 08 02 A6 */ mflr r0 -/* 8025D7F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025D7F4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025D7F8 93 C1 00 08 */ stw r30, 8(r1) -/* 8025D7FC 7C 7E 1B 78 */ mr r30, r3 -/* 8025D800 7C 9F 23 78 */ mr r31, r4 -/* 8025D804 88 03 01 6A */ lbz r0, 0x16a(r3) -/* 8025D808 28 00 00 01 */ cmplwi r0, 1 -/* 8025D80C 41 82 00 10 */ beq lbl_8025D81C -/* 8025D810 88 1E 01 6B */ lbz r0, 0x16b(r30) -/* 8025D814 28 00 00 00 */ cmplwi r0, 0 -/* 8025D818 41 82 00 0C */ beq lbl_8025D824 -lbl_8025D81C: -/* 8025D81C 38 60 00 00 */ li r3, 0 -/* 8025D820 48 00 00 34 */ b lbl_8025D854 -lbl_8025D824: -/* 8025D824 88 1E 01 6C */ lbz r0, 0x16c(r30) -/* 8025D828 28 00 00 04 */ cmplwi r0, 4 -/* 8025D82C 41 82 00 0C */ beq lbl_8025D838 -/* 8025D830 38 60 00 00 */ li r3, 0 -/* 8025D834 48 00 00 20 */ b lbl_8025D854 -lbl_8025D838: -/* 8025D838 4B DD 4F CD */ bl getTime__11dLib_time_cFv -/* 8025D83C 90 9E 01 34 */ stw r4, 0x134(r30) -/* 8025D840 90 7E 01 30 */ stw r3, 0x130(r30) -/* 8025D844 38 00 00 01 */ li r0, 1 -/* 8025D848 98 1E 01 6A */ stb r0, 0x16a(r30) -/* 8025D84C 9B FE 01 6B */ stb r31, 0x16b(r30) -/* 8025D850 38 60 00 01 */ li r3, 1 -lbl_8025D854: -/* 8025D854 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025D858 83 C1 00 08 */ lwz r30, 8(r1) -/* 8025D85C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025D860 7C 08 03 A6 */ mtlr r0 -/* 8025D864 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025D868 4E 80 00 20 */ blr