Leahnaya/berry-fix
1
0
Fork 0
mirror of https://github.com/pret/berry-fix.git synced 2026-04-25 07:27:25 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clean up rtc

Browse Source
This commit is contained in:
GriffinR 2022-01-15 14:57:41 -05:00
parent cb5ff5848b
commit e2c5331051
5 changed files with 62 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
payload/include/global.h
View File

@ -26,13 +26,6 @@
#define RomHeaderMagic ((const u8 *) 0x080000B2)
#define RomHeaderSoftwareVersion ((const u8 *) 0x080000BC)
#define LocalTimeOffset ((struct Time *)0x02028098)
#define LastBerryTreeUpdate ((struct Time *)0x020280A0)
#define POKEMON_SLOTS_NUMBER 412
#define POKEMON_NAME_LENGTH 10
#define OT_NAME_LENGTH 7
#define min(a, b) ((a) < (b) ? (a) : (b))
#define max(a, b) ((a) >= (b) ? (a) : (b))
@ -59,19 +52,22 @@ struct Time
};
// Dummy Ruby/Sapphire save structs.
// Only the vars array in SaveBlock1 (for VAR_PACIFIDLOG_TM_RECEIVED_DAY specifically) is needed for the Berry Fix Program.
// Only vars, localTimeOffset, and lastBerryTreeUpdate are needed.
struct SaveBlock1
{
u8 dummy_PreVars[0x1340];
u8 dummy_0[0x1340];
u16 vars[VARS_COUNT];
u8 dummy_PostVars[0x2580];
u8 dummy_1[0x2580];
};
extern struct SaveBlock1 gSaveBlock1;
struct SaveBlock2
{
u8 dummy[0x890];
u8 dummy_0[0x98];
struct Time localTimeOffset;
struct Time lastBerryTreeUpdate;
u8 dummy_1[0x7E8];
};
extern struct SaveBlock2 gSaveBlock2;

6
payload/include/rtc.h
View File

@ -18,8 +18,8 @@
extern struct Time gTimeSinceBerryUpdate;
extern struct Time gRtcUTCTime;
bool32 rtc_maincb_is_rtc_working(void);
bool32 rtc_maincb_is_time_since_last_berry_update_positive(u8 *);
void rtc_maincb_fix_date(void);
bool32 BerryFix_TryInitRtc(void);
bool32 BerryFix_CalcTimeDifference(u8 *);
void BerryFix_SetDate(void);
#endif //GUARD_RTC_H

4
payload/src/event_data.c
View File

@ -31,7 +31,7 @@ bool32 BerryFix_ShouldResetPacifidlogTM(void)
{
u8 year;
u16 * var = GetVarPointer(VAR_PACIFIDLOG_TM_RECEIVED_DAY);
rtc_maincb_is_time_since_last_berry_update_positive(&year);
BerryFix_CalcTimeDifference(&year);
if (*var <= gRtcUTCTime.days)
return TRUE;
else
@ -43,7 +43,7 @@ bool32 BerryFix_ResetPacifidlogTM(void)
u8 year;
if (BerryFix_ShouldResetPacifidlogTM() == TRUE)
return TRUE;
rtc_maincb_is_time_since_last_berry_update_positive(&year);
BerryFix_CalcTimeDifference(&year);
if (gRtcUTCTime.days < 0)
return FALSE;
*GetVarPointer(VAR_PACIFIDLOG_TM_RECEIVED_DAY) = 1;

6
payload/src/main.c
View File

@ -196,7 +196,7 @@ void main_callback(u32 * state, void * unused1, void * unused2)
}
break;
case MAINCB_CHECK_RTC:
if (!rtc_maincb_is_rtc_working())
if (!BerryFix_TryInitRtc())
*state = MAINCB_ERROR;
else
++(*state); // MAINCB_CHECK_FLASH
@ -214,7 +214,7 @@ void main_callback(u32 * state, void * unused1, void * unused2)
*state = MAINCB_ERROR;
break;
case MAINCB_CHECK_TIME:
if (rtc_maincb_is_time_since_last_berry_update_positive(&year) == TRUE)
if (BerryFix_CalcTimeDifference(&year) == TRUE)
{
if (year == 0)
++(*state); // MAINCB_FIX_DATE
@ -230,7 +230,7 @@ void main_callback(u32 * state, void * unused1, void * unused2)
}
break;
case MAINCB_FIX_DATE:
rtc_maincb_fix_date();
BerryFix_SetDate();
gUpdateSuccessful |= 1;
*state = MAINCB_CHECK_PACIFIDLOG_TM;
break;

79
payload/src/rtc.c
View File

@ -120,7 +120,7 @@ static u16 RtcGetErrorStatus(void)
// Unused
static void RtcGetInfo(struct SiiRtcInfo * rtc)
{
if (sErrorStatus & 0xFF0)
if (sErrorStatus & RTC_ERR_FLAG_MASK)
*rtc = sDefaultRTC;
else
RtcGetRawInfo(rtc);
@ -258,15 +258,17 @@ static void CalcTimeDifference(struct Time * result, struct Time * t1, struct Ti
}
}
bool32 rtc_maincb_is_rtc_working(void)
// New code for Berry Fix Program starts here
bool32 BerryFix_TryInitRtc(void)
{
RtcInit();
if (RtcGetErrorStatus() & 0xFF0)
if (RtcGetErrorStatus() & RTC_ERR_FLAG_MASK)
return FALSE;
return TRUE;
}
void rtc_set_datetime(struct SiiRtcInfo * rtc)
static void RtcSetDateTime(struct SiiRtcInfo * rtc)
{
vu16 imeBak = REG_IME;
REG_IME = 0;
@ -274,13 +276,19 @@ void rtc_set_datetime(struct SiiRtcInfo * rtc)
REG_IME = imeBak;
}
bool32 rtc_maincb_is_time_since_last_berry_update_positive(u8 * year)
// The below are equivalent to &gSaveBlock2.localTimeOffset and &gSaveBlock2.lastBerryTreeUpdate.
// Replacing them both below doesn't match
#define SaveBlock2Addr (EWRAM_START + 0x28000)
#define LocalTimeOffset ((struct Time *)(SaveBlock2Addr + offsetof(struct SaveBlock2, localTimeOffset)))
#define LastBerryTreeUpdate ((struct Time *)(SaveBlock2Addr + offsetof(struct SaveBlock2, lastBerryTreeUpdate)))
bool32 BerryFix_CalcTimeDifference(u8 * year)
{
RtcGetRawInfo(&sRtcInfoWork);
*year = ConvertBcdToBinary(sRtcInfoWork.year);
RtcCalcTimeDifference(&sRtcInfoWork, &gRtcUTCTime, LocalTimeOffset);
CalcTimeDifference(&gTimeSinceBerryUpdate, LastBerryTreeUpdate, &gRtcUTCTime);
if (gTimeSinceBerryUpdate.days * 1440 + gTimeSinceBerryUpdate.hours * 60 + gTimeSinceBerryUpdate.minutes >= 0)
if (gTimeSinceBerryUpdate.days * 24 * 60 + gTimeSinceBerryUpdate.hours * 60 + gTimeSinceBerryUpdate.minutes >= 0)
return TRUE;
return FALSE;
}
@ -295,75 +303,82 @@ static u32 ConvertBinaryToBcd(u8 binary)
return bcd;
}
void sii_rtc_inc(u8 * a0)
static void RtcIncrement(u8 * val)
{
*a0 = ConvertBinaryToBcd(ConvertBcdToBinary(*a0) + 1);
*val = ConvertBinaryToBcd(ConvertBcdToBinary(*val) + 1);
}
void sii_rtc_inc_month(struct SiiRtcInfo * a0)
static void RtcIncrementMonth(struct SiiRtcInfo * rtc)
{
sii_rtc_inc(&a0->month);
if (ConvertBcdToBinary(a0->month) > 12)
RtcIncrement(&rtc->month);
if (ConvertBcdToBinary(rtc->month) > 12)
{
sii_rtc_inc(&a0->year);
a0->month = MONTH_JAN;
RtcIncrement(&rtc->year);
rtc->month = MONTH_JAN;
}
}
void sii_rtc_inc_day(struct SiiRtcInfo * a0)
static void RtcIncrementDay(struct SiiRtcInfo * rtc)
{
sii_rtc_inc(&a0->day);
if (ConvertBcdToBinary(a0->day) > sDaysPerMonth[ConvertBcdToBinary(a0->month) - 1])
RtcIncrement(&rtc->day);
if (ConvertBcdToBinary(rtc->day) > sDaysPerMonth[ConvertBcdToBinary(rtc->month) - 1])
{
if (!IsLeapYear(ConvertBcdToBinary(a0->year)) || ConvertBcdToBinary(a0->month) != MONTH_FEB || ConvertBcdToBinary(a0->day) != 29)
if (!IsLeapYear(ConvertBcdToBinary(rtc->year)) || ConvertBcdToBinary(rtc->month) != MONTH_FEB || ConvertBcdToBinary(rtc->day) != 29)
{
a0->day = 1;
sii_rtc_inc_month(a0);
rtc->day = 1;
RtcIncrementMonth(rtc);
}
}
}
bool32 rtc_is_past_feb_28_2000(struct SiiRtcInfo * a0)
// When fixing the RTC, consider if the leap day on Feb 29, 2000 was reached
static bool32 RtcNeedsLeapDayIncrement(struct SiiRtcInfo * rtc)
{
if (ConvertBcdToBinary(a0->year) == 0)
if (ConvertBcdToBinary(rtc->year) == 0)
{
if (ConvertBcdToBinary(a0->month) == MONTH_JAN)
if (ConvertBcdToBinary(rtc->month) == MONTH_JAN)
return FALSE;
if (ConvertBcdToBinary(a0->month) > MONTH_FEB)
if (ConvertBcdToBinary(rtc->month) > MONTH_FEB)
return TRUE;
if (ConvertBcdToBinary(a0->day) == 29)
if (ConvertBcdToBinary(rtc->day) == 29)
return TRUE;
return FALSE;
}
if (ConvertBcdToBinary(a0->year) == 1)
if (ConvertBcdToBinary(rtc->year) == 1)
return TRUE;
// After 2001 just set clock forward 365 days
return FALSE;
}
void rtc_maincb_fix_date(void)
void BerryFix_SetDate(void)
{
RtcGetRawInfo(&sRtcInfoWork);
if (ConvertBcdToBinary(sRtcInfoWork.year) == 0 || ConvertBcdToBinary(sRtcInfoWork.year) == 1)
{
if (ConvertBcdToBinary(sRtcInfoWork.year) == 1)
{
// Year is 2001, the Berry Glitch is occurring
// Set date forward to January 2, 2002
sRtcInfoWork.year = 2;
sRtcInfoWork.month = MONTH_JAN;
sRtcInfoWork.day = 2;
rtc_set_datetime(&sRtcInfoWork);
RtcSetDateTime(&sRtcInfoWork);
}
else
{
if (rtc_is_past_feb_28_2000(&sRtcInfoWork) == TRUE)
// Berry Glitch hasn't begun yet (or was already passed)
// Set the date forward 365/366 days to avoid the glitch
if (RtcNeedsLeapDayIncrement(&sRtcInfoWork) == TRUE)
{
sii_rtc_inc_day(&sRtcInfoWork);
sii_rtc_inc(&sRtcInfoWork.year);
RtcIncrementDay(&sRtcInfoWork);
RtcIncrement(&sRtcInfoWork.year);
}
else
{
sii_rtc_inc(&sRtcInfoWork.year);
RtcIncrement(&sRtcInfoWork.year);
}
rtc_set_datetime(&sRtcInfoWork);
RtcSetDateTime(&sRtcInfoWork);
}
}
}