mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-06-12 13:34:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_timer work

Browse Source
This commit is contained in:
Jasper St. Pierre
2024-01-14 21:08:10 -08:00
parent 5ab99df86e
commit a81fa8d29b
3 changed files with 118 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/d_com_inf_game.h
+20
View File
@@ -437,9 +437,13 @@ public:
u8 getIkadaShipId() { return mIkadaShipId; }
u8 getIkadaShipBeforeRoomId() { return mIkadaShipBeforeRoomId; }
void setTimerPtr(dTimer_c* timer) { mTimerInfo.mTimerPtr = timer; }
dTimer_c* getTimerPtr() { return mTimerInfo.mTimerPtr; }
void setTimerMode(s32 mode) { mTimerInfo.mTimerMode = mode; }
s32 getTimerMode() { return mTimerInfo.mTimerMode; }
void setTimerNowTimeMs(s32 ms) { mTimerInfo.mTimerNowTimeMs = ms; }
s32 getTimerNowTimeMs() { return mTimerInfo.mTimerNowTimeMs; }
void setTimerLimitTimeMs(s32 ms) { mTimerInfo.mTimerLimitTimeMs = ms; }
s32 getTimerLimitTimeMs() { return mTimerInfo.mTimerLimitTimeMs; }
s16 getItemMagicCount() { return mItemMagicCount; }
@@ -3086,6 +3090,22 @@ inline u32 dComIfG_getTimerRestTimeMs() {
return g_dComIfG_gameInfo.play.getTimerLimitTimeMs() - g_dComIfG_gameInfo.play.getTimerNowTimeMs();
}
inline void dComIfG_setTimerPtr(dTimer_c* timer) {
g_dComIfG_gameInfo.play.setTimerPtr(timer);
}
inline void dComIfG_setTimerMode(int ms) {
g_dComIfG_gameInfo.play.setTimerMode(ms);
}
inline void dComIfG_setTimerNowTimeMs(int ms) {
g_dComIfG_gameInfo.play.setTimerNowTimeMs(ms);
}
inline void dComIfG_setTimerLimitTimeMs(int ms) {
g_dComIfG_gameInfo.play.setTimerLimitTimeMs(ms);
}
int dComIfG_changeOpeningScene(scene_class* i_scene, s16 i_procName);
#endif /* D_COM_D_COM_INF_GAME_H */
include/d/d_timer.h
+24 -13
View File
@@ -4,6 +4,7 @@
#include "f_op/f_op_msg_mng.h"
#include "d/d_drawlist.h"
#include "SSystem/SComponent/c_phase.h"
#include "dolphin/os/OSTime.h"
class J2DPane;
class JKRArchive;
@@ -50,7 +51,7 @@ public:
/* 0x224 */ J2DPane* field_0x224;
/* 0x228 */ J2DPane* field_0x228;
/* 0x22C */ J2DPicture* field_0x22c;
/* 0x230 */ u32 field_0x230;
/* 0x230 */ s32 mRupeeNum;
/* 0x234 */ s8 field_0x234;
/* 0x235 */ u8 field_0x235;
/* 0x236 */ u8 field_0x236;
@@ -64,26 +65,36 @@ public:
BOOL _draw();
BOOL _delete();
void RestTimeCheck(int);
void deleteCheck();
BOOL deleteCheck();
void SetSE();
void start();
void start(s16);
void stock_start();
void stock_start(s16);
bool start();
bool start(s16);
bool stock_start();
bool stock_start(s16);
void stop(u8);
void restart(u8);
void end(int);
void deleteRequest();
void getTimeMs();
void getLimitTimeMs();
void getRestTimeMs();
bool deleteRequest();
s32 getTimeMs();
s32 getLimitTimeMs();
s32 getRestTimeMs();
/* 0x0FC */ dDlst_TimerScrnDraw_c* mpScrnDraw;
/* 0x100 */ void* iconTex;
/* 0x104 */ request_of_phase_process_class mPhs;
/* 0x10C */ u8 field_0x10C[0x154 - 0x10C];
/* 0x154 */ u32 mType;
/* 0x158 */ u8 field_0x158[0x170 - 0x158];
/* 0x10C */ u32 field_0x10c;
/* 0x110 */ OSTime mStartTime;
/* 0x118 */ OSTime mTime;
/* 0x120 */ OSTime field_0x120;
/* 0x128 */ u8 field_0x128[0x140 - 0x128];
/* 0x140 */ OSTime mLimitTime;
/* 0x148 */ u8 field_0x148[0x154 - 0x148];
/* 0x154 */ s32 mTimerMode;
/* 0x158 */ u8 field_0x158[0x160 - 0x158];
/* 0x160 */ s16 field_0x160;
/* 0x162 */ s16 field_0x162;
/* 0x164 */ u8 mState;
/* 0x168 */ u32 field_0x168[2];
/* 0x170 */ JKRSolidHeap* mpSolidHeap;
/* 0x174 */ u32 field_0x174;
};
src/d/d_timer.cpp
+74 -33
View File
@@ -81,8 +81,8 @@ s32 dTimer_c::_create() {
mpScrnDraw->setRupeePos(prm->mRupeePos.x, prm->mRupeePos.y);
mpScrnDraw->setTimerPos(prm->mTimerPos.x, prm->mTimerPos.y);
mpScrnDraw->setShowType(prm->mShowType);
mType = prm->field_0x1c;
if (mType == 7) {
mTimerMode = prm->field_0x1c;
if (mTimerMode == 7) {
}
}
}
@@ -94,12 +94,30 @@ BOOL dTimer_c::_execute() {
/* 8023BF88-8023BFE4 .text _draw__8dTimer_cFv */
BOOL dTimer_c::_draw() {
/* Nonmatching */
if (dMenu_flag())
return TRUE;
dComIfGd_set2DOpa(mpScrnDraw);
return TRUE;
}
/* 8023BFE4-8023C0B8 .text _delete__8dTimer_cFv */
BOOL dTimer_c::_delete() {
/* Nonmatching */
if (mpSolidHeap != NULL)
mDoExt_destroySolidHeap(mpSolidHeap);
if (mTimerMode == 3 && mState != 6 && mState != 5 && mState != 4) {
dComIfG_setTimerNowTimeMs(getTimeMs());
dComIfG_setTimerLimitTimeMs(getLimitTimeMs());
dComIfG_setTimerMode(mTimerMode);
} else {
dComIfG_setTimerNowTimeMs(0);
dComIfG_setTimerLimitTimeMs(0);
dComIfG_setTimerMode(-1);
}
dComIfG_setTimerPtr(NULL);
dComIfG_resDelete(&mPhs, "Timer");
return TRUE;
}
/* 8023C0B8-8023C110 .text RestTimeCheck__8dTimer_cFi */
@@ -108,8 +126,9 @@ void dTimer_c::RestTimeCheck(int) {
}
/* 8023C110-8023C124 .text deleteCheck__8dTimer_cFv */
void dTimer_c::deleteCheck() {
BOOL dTimer_c::deleteCheck() {
/* Nonmatching */
return mState == 5;
}
/* 8023C124-8023C268 .text SetSE__8dTimer_cFv */
@@ -118,23 +137,41 @@ void dTimer_c::SetSE() {
}
/* 8023C268-8023C2CC .text start__8dTimer_cFv */
void dTimer_c::start() {
/* Nonmatching */
bool dTimer_c::start() {
if (mState == 0 || mState == 1) {
mState = 2;
mTime = mStartTime = OSGetTime();
return true;
} else {
return false;
}
}
/* 8023C2CC-8023C2F4 .text start__8dTimer_cFs */
void dTimer_c::start(s16) {
/* Nonmatching */
bool dTimer_c::start(s16 param_1) {
if (mState == 0) {
field_0x160 = param_1;
mState = 1;
return true;
} else {
return false;
}
}
/* 8023C2F4-8023C3A8 .text stock_start__8dTimer_cFv */
void dTimer_c::stock_start() {
bool dTimer_c::stock_start() {
/* Nonmatching */
}
/* 8023C3A8-8023C3D0 .text stock_start__8dTimer_cFs */
void dTimer_c::stock_start(s16) {
/* Nonmatching */
bool dTimer_c::stock_start(s16 param_1) {
if (mState == 0) {
field_0x160 = param_1;
mState = 3;
return true;
} else {
return false;
}
}
/* 8023C3D0-8023C454 .text stop__8dTimer_cFUc */
@@ -153,22 +190,23 @@ void dTimer_c::end(int) {
}
/* 8023C56C-8023C57C .text deleteRequest__8dTimer_cFv */
void dTimer_c::deleteRequest() {
/* Nonmatching */
bool dTimer_c::deleteRequest() {
mState = 6;
return true;
}
/* 8023C57C-8023C5E0 .text getTimeMs__8dTimer_cFv */
void dTimer_c::getTimeMs() {
s32 dTimer_c::getTimeMs() {
/* Nonmatching */
}
/* 8023C5E0-8023C628 .text getLimitTimeMs__8dTimer_cFv */
void dTimer_c::getLimitTimeMs() {
/* Nonmatching */
s32 dTimer_c::getLimitTimeMs() {
return OSTicksToMilliseconds(mLimitTime);
}
/* 8023C628-8023C69C .text getRestTimeMs__8dTimer_cFv */
void dTimer_c::getRestTimeMs() {
s32 dTimer_c::getRestTimeMs() {
/* Nonmatching */
}
@@ -271,30 +309,33 @@ void dDlst_TimerScrnDraw_c::setTimer(int time) {
/* 8023CCD8-8023CEF0 .text setRupee__21dDlst_TimerScrnDraw_cFs */
void dDlst_TimerScrnDraw_c::setRupee(s16 num) {
/* Nonmatching */
if (num != field_0x230) {
if (num > field_0x230) {
field_0x230++;
if (num != mRupeeNum) {
if (num < mRupeeNum) {
mRupeeNum--;
} else {
field_0x230--;
mRupeeNum++;
}
if (field_0x230 < 0)
field_0x230 = 0;
if (mRupeeNum < 0)
mRupeeNum = 0;
changeNumberTexture(field_0x21c, field_0x230 % 10);
changeNumberTexture(field_0x218, (field_0x230 % 100) / 10);
changeNumberTexture(field_0x214, field_0x230 / 100);
s32 r001 = mRupeeNum % 10;
s32 r010 = (mRupeeNum % 100) / 10;
s32 r100 = mRupeeNum / 100;
changeNumberTexture(field_0x228, field_0x230 % 10);
changeNumberTexture(field_0x224, (field_0x230 % 100) / 10);
changeNumberTexture(field_0x220, field_0x230 / 100);
changeNumberTexture(field_0x21c, r001);
changeNumberTexture(field_0x218, r010);
changeNumberTexture(field_0x214, r100);
changeNumberTexture(field_0x228, r001);
changeNumberTexture(field_0x224, r010);
changeNumberTexture(field_0x220, r100);
}
if (dComIfGp_event_getMode() == 1) {
if (field_0x158.mUserArea < 5) {
field_0x158.mUserArea++;
s16 alphaStep = 5 - field_0x008.mUserArea;
s16 alphaStep = field_0x158.mUserArea;
f32 alpha = 1.0f - ((f32)alphaStep * (f32)alphaStep) / 25.0f;
fopMsgM_setNowAlpha(&field_0x158, alpha);
fopMsgM_setNowAlpha(&field_0x190, alpha);
@@ -303,7 +344,7 @@ void dDlst_TimerScrnDraw_c::setRupee(s16 num) {
} else {
if (field_0x158.mUserArea > 0) {
field_0x158.mUserArea--;
s16 alphaStep = 5 - field_0x008.mUserArea;
s16 alphaStep = field_0x158.mUserArea;
f32 alpha = 1.0f - ((f32)alphaStep * (f32)alphaStep) / 25.0f;
fopMsgM_setNowAlpha(&field_0x158, alpha);
fopMsgM_setNowAlpha(&field_0x190, alpha);