izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Incorporate SCHEDULE_TIME

Browse Source
This commit is contained in:
angie
2023-10-22 08:55:40 -03:00
parent 466b4d6f26
commit 1aba20892b
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overlays/actors/ovl_En_An/z_en_an.c
+1 -7
View File
@@ -1581,9 +1581,6 @@ s32 EnAn_MsgEvent_LaundryPool(Actor* thisx, PlayState* play) {
return ret;
}
// TODO: figure out what to do with this
#define SCHEDULE_CALC_TIME_ALT(hour, minute) SCHEDULE_CONVERT_TIME((((hour)*60.0f) + (minute)) * (0x10000 / 60 / 24.0f))
s32* EnAn_GetMsgEventScript(EnAn* this, PlayState* play) {
Player* player = GET_PLAYER(play);
@@ -1659,10 +1656,7 @@ s32* EnAn_GetMsgEventScript(EnAn* this, PlayState* play) {
return sAnjuMsgScript_80B58A44;
}
// if ((gSaveContext.save.time - 0x3FFC) < 0x5883) {
// if (SCHEDULE_CONVERT_TIME_ALT(gSaveContext.save.time) < SCHEDULE_CONVERT_TIME_ALT(CLOCK_TIME(14,
// 18))) {
if (SCHEDULE_CONVERT_TIME_ALT(gSaveContext.save.time) < SCHEDULE_CALC_TIME_ALT(14, 18)) {
if (SCHEDULE_CONVERT_TIME(gSaveContext.save.time) < SCHEDULE_TIME(14, 18)) {
return sAnjuMsgScript_80B58ABC;
}