mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-31 08:06:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_npc_zra mostly done, misc npc work (#2140)

Browse Source
This commit is contained in:
Caroline Madsen
2024-04-26 22:20:26 -04:00
committed by GitHub
parent c163dc9ed3
commit 669c7d920b
61 changed files with 9187 additions and 3971 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/meter/d_meter2_info.h
+4 -4
View File
@@ -154,8 +154,8 @@ public:
void setMsgTimeMs(u32 msgTime) { mMsgTimeMs = msgTime; }
void setTimeMs(s32 i_time) { mTimeMs = i_time; }
u32 getTimeMs() { return mTimeMs; }
u8 getNowCount() { return mNowCount; }
u8 getMaxCount() { return mMaxCount; }
int getNowCount() { return mNowCount; }
int getMaxCount() { return mMaxCount; }
void setScopeZoomPointer(u8 param_0) { mScopeZoomPointer = param_0; }
u8 getItemExplainWindowStatus() { return mItemExplainWindowStatus; }
void setItemExplainWindowStatus(u8 i_value) { mItemExplainWindowStatus = i_value; }
@@ -611,11 +611,11 @@ inline void dMeter2Info_setTimeMs(s32 i_time) {
g_meter2_info.setTimeMs(i_time);
}
inline u8 dMeter2Info_getNowCount() {
inline int dMeter2Info_getNowCount() {
return g_meter2_info.getNowCount();
}
inline u8 dMeter2Info_getMaxCount() {
inline int dMeter2Info_getMaxCount() {
return g_meter2_info.getMaxCount();
}