summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/6BA500.h2
-rw-r--r--include/m_common_data.h3
-rw-r--r--include/m_time.h29
3 files changed, 24 insertions, 10 deletions
diff --git a/include/6BA500.h b/include/6BA500.h
index e80d8fb..90794fd 100644
--- a/include/6BA500.h
+++ b/include/6BA500.h
@@ -7,7 +7,7 @@
void func_800968C0_jp(void);
// void func_80096B2C_jp();
// void func_80096B4C_jp();
-void func_80096B64_jp(void);
+void Kabu_manager(void);
// void func_80096BF0_jp();
#endif
diff --git a/include/m_common_data.h b/include/m_common_data.h
index 20758c6..8cbd825 100644
--- a/include/m_common_data.h
+++ b/include/m_common_data.h
@@ -90,7 +90,8 @@ typedef struct CommonData {
/* 0x0F2A0 */ UNK_TYPE1 unk_0F2A0[0x17C];
/* 0x0F41C */ SnowmanData snowmanData[SNOWMAN_SAVE_COUNT];
/* 0x0F428 */ u64 melody;
- /* 0x0F430 */ UNK_TYPE1 unk_F430[0x8];
+ /* 0x0F430 */ UNK_TYPE1 unk_F430[0x4];
+ /* 0x0F434 */ lbRTC_ymd_t renewTime;
/* 0x0F438 */ u8 stationType;
/* 0x0F439 */ u8 saveWeather;
/* 0x0F440 */ u8 unk_F440[0x2];
diff --git a/include/m_time.h b/include/m_time.h
index eb6dc05..f12b565 100644
--- a/include/m_time.h
+++ b/include/m_time.h
@@ -41,7 +41,7 @@ typedef enum mTM_TERM{
/* 16 */ mTM_TERM_16,
/* 17 */ mTM_TERM_17,
- /* 18 */ mTM_TERM_NUM
+ /* 18 */ mTM_TERM_MAX
} mTM_TERM;
#define mTM_RENEW_TIME_NONE 0
@@ -60,17 +60,17 @@ typedef enum mTM_RENEW_TIME{
#define mTM_MINUTES_IN_HOUR 60
-typedef struct mTM_calendar_term_t {
+typedef struct TimeCalendarTerm {
/* 0x00 */ lbRTC_month_t month;
/* 0x01 */ lbRTC_day_t day;
/* 0x02 */ u16 season;
- /* 0x04 */ s16 bgitem_profile;
- /* 0x06 */ s16 bgitem_bank;
-} mTM_calendar_term_t; // size = 0x8
+ /* 0x04 */ s16 bgitemProfile;
+ /* 0x06 */ s16 bgitemBank;
+} TimeCalendarTerm; // size = 0x8
-extern lbRTC_time_c mTM_rtcTime_clear_code;
-extern lbRTC_ymd_t mTM_rtcTime_ymd_clear_code;
-extern lbRTC_time_c mTM_rtcTime_default_code;
+extern const lbRTC_time_c mTM_rtcTime_clear_code;
+extern const lbRTC_ymd_t mTM_rtcTime_ymd_clear_code;
+extern const lbRTC_time_c mTM_rtcTime_default_code;
#define mTM_IsTimeCleared(time) (lbRTC_IsEqualTime((time), &mTM_rtcTime_clear_code, lbRTC_CHECK_ALL) == TRUE)
#define mTM_AreTimesEqual(t0, t1) (lbRTC_IsEqualTime(t0, t1, lbRTC_CHECK_ALL))
@@ -78,4 +78,17 @@ extern lbRTC_time_c mTM_rtcTime_default_code;
#define mTM_CheckCmpYMDEqual(ymd0, ymd1) ((ymd0)->year == (ymd1)->year && (ymd0)->month == (ymd1)->month && (ymd0)->day == (ymd1)->day)
#define mTM_CheckCmpYMDClear(ymd0) ((ymd0)->year == mTM_rtcTime_ymd_clear_code.year || (ymd0)->month == mTM_rtcTime_ymd_clear_code.month || (ymd0)->day == mTM_rtcTime_ymd_clear_code.day)
+s32 mTM_get_termIdx(void);
+void mTM_set_season(void);
+void mTM_clear_renew_is(void);
+s32 mTM_check_renew_time(u8 flag);
+void mTM_off_renew_time(u8 flag);
+void mTM_set_renew_is(void);
+void mTM_set_renew_time(lbRTC_ymd_t* renewTime, lbRTC_time_c* time);
+void mTM_renewal_renew_time(void);
+void mTM_disp_time(s32 unused);
+s32 mTM_TimestepControl(void);
+void mTM_time(void);
+
+
#endif