From 1aba20892b48780684de5260fadfec62d0bd112a Mon Sep 17 00:00:00 2001 From: angie Date: Sun, 22 Oct 2023 08:55:40 -0300 Subject: [PATCH] Incorporate SCHEDULE_TIME --- src/overlays/actors/ovl_En_An/z_en_an.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/overlays/actors/ovl_En_An/z_en_an.c b/src/overlays/actors/ovl_En_An/z_en_an.c index 332cf7c70..e1ce024dc 100644 --- a/src/overlays/actors/ovl_En_An/z_en_an.c +++ b/src/overlays/actors/ovl_En_An/z_en_an.c @@ -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; }