diff --git a/include/functions.h b/include/functions.h index c6a8a0c09..f590371c1 100644 --- a/include/functions.h +++ b/include/functions.h @@ -1816,12 +1816,12 @@ void OLib_DbCameraVec3fSum(PosRot* a, Vec3f* b, Vec3f* dest, s16 mode); // void func_8010DC58(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5); // void func_8010DE38(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6); // void Interface_InitVertices(void); -// void Interface_TimerCallback(void); -void func_8010E9F0(s16 timerId, s16 timeLimit); -void func_8010EA9C(s16 timeLimit, s16 arg1); -// void func_8010EB50(void); -// void func_8010EBA0(void); -// void func_8010EC54(void); +// void Interface_PostmanTimerCallback(void); +void Interface_StartTimer(s16 timerId, s16 timeLimit); +void Interface_StartPostmanTimer(s16 timeLimit, s16 bunnyHoodState); +// void Interface_StartGoronRaceTimer(void); +// void Interface_StartBottleTimer(void); +// void Interface_GetCompressedTimerDigits(void); void Interface_NewDay(PlayState* play, s32 day); void Interface_SetHudVisibility(u16 hudVisibility); // void func_80110038(void); @@ -1869,10 +1869,10 @@ void Interface_SetPerfectMinigame(PlayState* play, s16 rewardType); // void func_8011B9E0(void); // void func_8011BF70(void); // void Interface_DrawMinigamePerfect(void); -void func_8011C808(PlayState* play); -// void func_8011C898(void); +void Interface_StartMoonCrash(PlayState* play); +// void Interface_GetTimerDigits(void); // void Interface_DrawTimers(void); -// void Interface_UpdateTimers(void); +// void Interface_UpdateBottleTimers(void); // void Interface_DrawMinigameIcons(void); // void Interface_Draw(UNK_TYPE4 ctxt); // void Interface_LoadStory(void); @@ -1946,7 +1946,7 @@ s32 Player_ActionToExplosive(Player* player, s32 actionParam); s32 Player_GetExplosiveHeld(Player* player); s32 func_80124278(Actor* actor, s32 arg1); s32 func_801242B4(Player* player); -s32 func_801242DC(PlayState* play); +s32 Player_GetEnvTimerType(PlayState* play); void func_80124420(Player* player); void func_80124618(struct_80124618 arg0[], f32 curFrame, Vec3f* arg2); void func_801246F4(PlayState* play, void** skeleton, Vec3s* jointTable, s32 dListCount, s32 lod, s32 tunic, s32 boots, s32 face, OverrideLimbDrawFlex overrideLimbDraw, PostLimbDrawFlex postLimbDraw, Actor* actor); diff --git a/include/regs.h b/include/regs.h index 9e7e99ace..1bd8e4b90 100644 --- a/include/regs.h +++ b/include/regs.h @@ -71,6 +71,8 @@ #define R_A_ICON_X XREG(20) #define R_A_BTN_COLOR(i) XREG(22 + i) #define R_MAGIC_CONSUME_TIMER_GIANT XREG(41) +#define R_FINAL_HOURS_TIMER_Y XREG(80) +#define R_FINAL_HOURS_TIMER_X XREG(81) #define R_MINIMAP_DISABLED XREG(95) #define R_B_LABEL_DD WREG(0) #define R_OW_MINIMAP_X WREG(29) diff --git a/include/variables.h b/include/variables.h index bde090b70..263ee8cfe 100644 --- a/include/variables.h +++ b/include/variables.h @@ -1033,19 +1033,19 @@ extern UNK_PTR D_801BF5C0; // extern UNK_TYPE2 sMagicBarOutlinePrimBlue; // extern UNK_TYPE2 sMagicBorderRatio; // extern UNK_TYPE2 sMagicBorderStep; -// extern UNK_TYPE2 D_801BF8DC; -// extern UNK_TYPE2 D_801BF8E0; -// extern UNK_TYPE2 D_801BF8E4; -// extern UNK_TYPE4 D_801BF8E8; -// extern UNK_TYPE4 D_801BF8F0; +// extern UNK_TYPE2 sEnvTimerType; +// extern UNK_TYPE2 sEnvTimerActive; +// extern UNK_TYPE2 sPostmanBunnyHoodState; +// extern UNK_TYPE4 sTimerPausedOsTime; +// extern UNK_TYPE4 sBottleTimerPausedOsTime; // extern UNK_TYPE4 D_801BF8F4; // extern UNK_TYPE4 D_801BF8F8; // extern UNK_TYPE4 D_801BF8FC; // extern UNK_TYPE4 D_801BF930; // extern UNK_TYPE4 D_801BF934; -// extern UNK_TYPE1 D_801BF968; +// extern UNK_TYPE1 sIsTimerPaused; // extern UNK_TYPE1 D_801BF96A; -// extern UNK_TYPE1 D_801BF96C; +// extern UNK_TYPE1 sIsBottleTimerPaused; // extern UNK_TYPE1 D_801BF96E; // extern UNK_TYPE2 sTimerId; // extern UNK_TYPE1 D_801BF972; @@ -1085,7 +1085,7 @@ extern UNK_PTR D_801BF5C0; // extern UNK_TYPE2 D_801BFA4C; // extern UNK_TYPE2 D_801BFA64; // extern UNK_TYPE2 D_801BFA74; -// extern UNK_TYPE4 D_801BFA84; +// extern UNK_TYPE4 sPostmanTimerInputBtnAPressed; // extern UNK_TYPE1 sDoActionTextures; // extern UNK_TYPE1 D_801BFAB8; // extern UNK_TYPE1 D_801BFAC4; @@ -1137,15 +1137,15 @@ extern UNK_PTR D_801BF5C0; // extern UNK_TYPE2 D_801BFCA8; // extern UNK_TYPE1 D_801BFCB8; // extern UNK_TYPE4 D_801BFCC4; -// extern UNK_TYPE2 D_801BFCE4; -// extern UNK_TYPE2 D_801BFCE8; +// extern UNK_TYPE2 sTimerStateTimer; +// extern UNK_TYPE2 sTimerDigits; // extern UNK_TYPE2 D_801BFCEA; // extern UNK_TYPE2 D_801BFCEC; // extern UNK_TYPE2 D_801BFCEE; // extern UNK_TYPE2 D_801BFCF0; // extern UNK_TYPE2 D_801BFCF2; // extern UNK_TYPE2 D_801BFCF4; -// extern UNK_TYPE2 D_801BFCF8; +// extern UNK_TYPE2 sTimerBeepSfxSeconds; // extern UNK_TYPE2 D_801BFCFC; // extern UNK_TYPE2 D_801BFD0C; // extern UNK_TYPE1 D_801BFD1C; @@ -3153,7 +3153,7 @@ extern s16 D_801F4E7A; // extern UNK_TYPE1 D_801F57B4; // extern UNK_TYPE1 D_801F5834; // extern NmiBuff* gNMIBuffer; -// extern UNK_TYPE1 D_801F5850; +// extern UNK_TYPE1 sPostmanTimerInput; // extern UNK_TYPE1 D_801F58B0; // extern UNK_TYPE1 D_801F59AC; // extern UNK_TYPE1 D_801F59B0; diff --git a/include/z64item.h b/include/z64item.h index 49c49a441..6ee7e96ec 100644 --- a/include/z64item.h +++ b/include/z64item.h @@ -299,9 +299,6 @@ typedef enum { #define BOTTLE_FIRST 0 #define BOTTLE_MAX 6 -#define BOTTLE_FIRST 0 -#define BOTTLE_MAX 6 - typedef enum { /* 0x00 */ GI_NONE, /* 0x01 */ GI_RUPEE_GREEN, diff --git a/include/z64player.h b/include/z64player.h index f49f30688..4aa40aedd 100644 --- a/include/z64player.h +++ b/include/z64player.h @@ -70,6 +70,14 @@ typedef enum { /* 0x19 */ PLAYER_MASK_MAX } PlayerMask; +typedef enum { + /* 0 */ PLAYER_ENV_TIMER_NONE, + /* 1 */ PLAYER_ENV_TIMER_HOTROOM, + /* 2 */ PLAYER_ENV_TIMER_UNDERWATER_FLOOR, + /* 3 */ PLAYER_ENV_TIMER_SWIMMING, + /* 4 */ PLAYER_ENV_TIMER_UNDERWATER_FREE +} PlayerEnvTimer; + typedef enum PlayerActionParam { /* -1 */ PLAYER_AP_MINUS1 = -1, /* 0x00 */ PLAYER_AP_NONE, diff --git a/include/z64save.h b/include/z64save.h index b918bd21a..cfaf07e5a 100644 --- a/include/z64save.h +++ b/include/z64save.h @@ -3,6 +3,7 @@ #include "ultra64.h" #include "z64math.h" +#include "z64item.h" #include "os.h" struct GameState; @@ -54,37 +55,52 @@ typedef enum { #define MAGIC_NORMAL_METER 0x30 #define MAGIC_DOUBLE_METER (2 * MAGIC_NORMAL_METER) +#define SECONDS_TO_TIMER(seconds) ((seconds) * 100) + +// 1 centiSecond = 10 milliSeconds = 1/100 seconds +#define SECONDS_TO_TIMER_PRECISE(seconds, centiSeconds) ((seconds) * 100 + (centiSeconds)) + typedef enum { - /* 0 */ TIMER_STATE_OFF, - /* 1 */ TIMER_STATE_1, - /* 2 */ TIMER_STATE_2, - /* 3 */ TIMER_STATE_3, - /* 4 */ TIMER_STATE_4, - /* 5 */ TIMER_STATE_5, - /* 6 */ TIMER_STATE_6, - /* 7 */ TIMER_STATE_7, - /* 8 */ TIMER_STATE_8, - /* 9 */ TIMER_STATE_9, + /* 0 */ TIMER_ID_POSTMAN, // postman's counting minigame + /* 1 */ TIMER_ID_1, // minigame timer + /* 2 */ TIMER_ID_2, + /* 3 */ TIMER_ID_FINAL_HOURS, // countdown until mooncrash + /* 4 */ TIMER_ID_4, + /* 5 */ TIMER_ID_ENV, // environmental timer (underwater or hot room) + /* 6 */ TIMER_ID_GORON_RACE_UNUSED, + /* 7 */ TIMER_ID_MAX, + /* 99 */ TIMER_ID_NONE = 99, +} TimerId; + +typedef enum { + /* 0 */ TIMER_COUNT_DOWN, + /* 1 */ TIMER_COUNT_UP +} TimerDirection; + +typedef enum { + /* 0 */ TIMER_STATE_OFF, + /* 1 */ TIMER_STATE_1, + /* 2 */ TIMER_STATE_2, + /* 3 */ TIMER_STATE_MOVING_TIMER, + /* 4 */ TIMER_STATE_4, + /* 5 */ TIMER_STATE_STOP, + /* 6 */ TIMER_STATE_6, + /* 7 */ TIMER_STATE_7, + /* 8 */ TIMER_STATE_ENV_START, + /* 9 */ TIMER_STATE_9, /* 10 */ TIMER_STATE_10, /* 11 */ TIMER_STATE_11, /* 12 */ TIMER_STATE_12, - /* 13 */ TIMER_STATE_13, - /* 14 */ TIMER_STATE_14, - /* 15 */ TIMER_STATE_15, - /* 16 */ TIMER_STATE_16 + /* 13 */ TIMER_STATE_POSTMAN_START, + /* 14 */ TIMER_STATE_POSTMAN_COUNTING, + /* 15 */ TIMER_STATE_POSTMAN_STOP, + /* 16 */ TIMER_STATE_POSTMAN_END } TimerState; typedef enum { - /* 0 */ TIMER_ID_0, - /* 1 */ TIMER_ID_1, // minigame timer - /* 2 */ TIMER_ID_2, - /* 3 */ TIMER_ID_3, // countdown until mooncrash - /* 4 */ TIMER_ID_4, - /* 5 */ TIMER_ID_5, - /* 6 */ TIMER_ID_6, - /* 7 */ TIMER_ID_MAX, - /* 99 */ TIMER_ID_NONE = 99, -} TimerId; + /* 0 */ BOTTLE_TIMER_STATE_OFF, + /* 1 */ BOTTLE_TIMER_STATE_COUNTING +} BottleTimerState; typedef enum { /* 0 */ HUD_VISIBILITY_IDLE, @@ -113,6 +129,7 @@ typedef enum { /* 50 */ HUD_VISIBILITY_ALL = 50, /* 52 */ HUD_VISIBILITY_OFF_NOW = 52 } HudVisibility; + typedef struct SramContext { /* 0x00 */ u8* readBuff; /* 0x04 */ u8 *saveBuf; @@ -273,11 +290,11 @@ typedef struct SaveContext { /* 0x1015 */ u8 unk_1015; /* 0x1016 */ u16 jinxTimer; /* 0x1018 */ s16 rupeeAccumulator; // "lupy_udct" - /* 0x101A */ u8 bottleStatus[6]; // "bottle_status", one entry for each bottle - /* 0x1020 */ OSTime bottleTimer1Value[6]; // "bottle_ostime", one entry for each bottle - /* 0x1050 */ OSTime bottleTimer2Value[6]; // "bottle_sub", one entry for each bottle - /* 0x1080 */ OSTime bottleTimer3Value[6]; // "bottle_time", one entry for each bottle - /* 0x10B0 */ OSTime bottleTimer4Value[6]; // "bottle_stop_time", one entry for each bottle + /* 0x101A */ u8 bottleTimerState[BOTTLE_MAX]; // "bottle_status", one entry for each bottle + /* 0x1020 */ OSTime bottleTimerStartOsTime[BOTTLE_MAX]; // "bottle_ostime", one entry for each bottle + /* 0x1050 */ u64 bottleTimerCurSubTime[BOTTLE_MAX]; // "bottle_sub", one entry for each bottle + /* 0x1080 */ u64 bottleTimerCurTime[BOTTLE_MAX]; // "bottle_time", one entry for each bottle + /* 0x10B0 */ OSTime bottleTimerPausedOsTime[BOTTLE_MAX]; // "bottle_stop_time", one entry for each bottle /* 0x10E0 */ u64 pictoPhoto[1400]; // buffer containing the pictograph photo /* 0x3CA0 */ s32 fileNum; // "file_no" /* 0x3CA4 */ s16 powderKegTimer; // "big_bom_timer" @@ -296,16 +313,16 @@ typedef struct SaveContext { /* 0x3DBF */ u8 showTitleCard; // "name_display" /* 0x3DC0 */ s16 unk_3DC0; // "shield_magic_timer" /* 0x3DC2 */ u8 unk_3DC2; // "pad1" - /* 0x3DC8 */ OSTime timerOsTime; // "get_time" - /* 0x3DD0 */ u8 timerState[7]; // "event_fg" - /* 0x3DD7 */ u8 timersNoTimeLimit[7]; // "calc_flag" - /* 0x3DE0 */ OSTime eventTimer1Value[7]; // "event_ostime" - /* 0x3E18 */ OSTime eventTimer2Value[7]; // "event_sub" - /* 0x3E50 */ OSTime funcTimer1Value[7]; // "func_time" - /* 0x3E88 */ OSTime funcTimer2Value[7]; // "func_end_time" - /* 0x3EC0 */ OSTime funcTimer3Value[7]; // "func_stop_time" - /* 0x3EF8 */ s16 timerX[7]; // "event_xp" - /* 0x3F06 */ s16 timerY[7]; // "event_yp" + /* 0x3DC8 */ OSTime timerOsTime; // "get_time" + /* 0x3DD0 */ u8 timerState[TIMER_ID_MAX]; // "event_fg" + /* 0x3DD7 */ u8 timerDirection[TIMER_ID_MAX]; // "calc_flag" + /* 0x3DE0 */ u64 timerCurTime[TIMER_ID_MAX]; // "event_ostime" + /* 0x3E18 */ u64 timerCurSubTime[TIMER_ID_MAX]; // "event_sub" + /* 0x3E50 */ OSTime timerStartOsTime[TIMER_ID_MAX]; // "func_time" + /* 0x3E88 */ OSTime timerEndOsTime[TIMER_ID_MAX]; // "func_end_time" + /* 0x3EC0 */ OSTime timerPausedOsTime[TIMER_ID_MAX]; // "func_stop_time" + /* 0x3EF8 */ s16 timerX[TIMER_ID_MAX]; // "event_xp" + /* 0x3F06 */ s16 timerY[TIMER_ID_MAX]; // "event_yp" /* 0x3F14 */ s16 unk_3F14; // "character_change" /* 0x3F16 */ u8 seqIndex; // "old_bgm" /* 0x3F17 */ u8 nightSeqIndex; // "old_env" diff --git a/src/boot_O2_g3/idle.c b/src/boot_O2_g3/idle.c index da93f13fd..942435fa7 100644 --- a/src/boot_O2_g3/idle.c +++ b/src/boot_O2_g3/idle.c @@ -1,4 +1,3 @@ -#include "prevent_bss_reordering.h" #include "global.h" u8 D_80096B20 = 1; diff --git a/src/code/code_8012EC80.c b/src/code/code_8012EC80.c index 4ff98b3a4..650bc1167 100644 --- a/src/code/code_8012EC80.c +++ b/src/code/code_8012EC80.c @@ -688,7 +688,7 @@ void Inventory_SetMapVisibility(s16 tingleIndex) { void Inventory_SaveDekuPlaygroundHighScore(s16 timerId) { s16 i; - gSaveContext.save.dekuPlaygroundHighScores[CURRENT_DAY - 1] = gSaveContext.eventTimer1Value[timerId]; + gSaveContext.save.dekuPlaygroundHighScores[CURRENT_DAY - 1] = gSaveContext.timerCurTime[timerId]; for (i = 0; i < 8; i++) { gSaveContext.save.inventory.dekuPlaygroundPlayerName[CURRENT_DAY - 1][i] = diff --git a/src/code/z_bgcheck.c b/src/code/z_bgcheck.c index e73dd7f6e..4b7c1d893 100644 --- a/src/code/z_bgcheck.c +++ b/src/code/z_bgcheck.c @@ -1,3 +1,4 @@ +#include "prevent_bss_reordering.h" #include "global.h" #include "vt.h" #include "overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope.h" diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index 2f17832bb..cd848a957 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -1,13 +1,15 @@ #include "global.h" +#include "z64snap.h" + #include "interface/parameter_static/parameter_static.h" #include "interface/do_action_static/do_action_static.h" #include "misc/story_static/story_static.h" + #include "overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope.h" -#include "z64snap.h" +#include "overlays/actors/ovl_En_Mm3/z_en_mm3.h" u8 func_800FE4A8(); s32 func_801234D4(PlayState* play); -// s16 func_801242DC(PlayState*); // s32 func_8008F2F8 (OoT) void func_801663C4(u8* arg0, u8* arg1, u32 arg2); extern Gfx D_0E0001C8[]; // Display List @@ -25,7 +27,7 @@ typedef struct { /* 0x03 */ u8 flags3; } RestrictionFlags; -Input D_801F5850[4]; +Input sPostmanTimerInput[4]; RestrictionFlags sRestrictionFlags[] = { { SCENE_20SICHITAI2, 0x00, 0x00, 0x00 }, @@ -181,12 +183,12 @@ s16 sExtraItemBases[] = { ITEM_NUT, // ITEM_NUT_UPGRADE_30 }; -s16 D_801BF8DC = 0; -s16 D_801BF8E0 = 0; -s16 D_801BF8E4 = 0; +s16 sEnvTimerType = PLAYER_ENV_TIMER_NONE; +s16 sEnvTimerActive = false; +s16 sPostmanBunnyHoodState = 0; -OSTime D_801BF8E8 = 0; -OSTime D_801BF8F0 = 0; +OSTime sTimerPausedOsTime = 0; +OSTime sBottleTimerPausedOsTime = 0; OSTime D_801BF8F8[] = { 0, 0, 0, 0, 0, 0, 0, }; @@ -194,8 +196,8 @@ OSTime D_801BF930[] = { 0, 0, 0, 0, 0, 0, 0, }; -u8 D_801BF968 = false; -u8 D_801BF96C = false; +u8 sIsTimerPaused = false; +u8 sIsBottleTimerPaused = false; s16 sTimerId = TIMER_ID_NONE; s16 D_801BF974 = 0; @@ -580,105 +582,106 @@ void Interface_InitVertices(PlayState* play) { // clang-format on } -s32 D_801BFA84 = 0; -void Interface_TimerCallback(s32 arg0) { +s32 sPostmanTimerInputBtnAPressed = false; +void Interface_PostmanTimerCallback(s32 arg0) { s32 btnAPressed; - func_80175E68(&D_801F5850[0], 0); - btnAPressed = CHECK_BTN_ALL(D_801F5850[0].cur.button, BTN_A); - if ((btnAPressed != D_801BFA84) && btnAPressed) { + func_80175E68(&sPostmanTimerInput[0], 0); + btnAPressed = CHECK_BTN_ALL(sPostmanTimerInput[0].cur.button, BTN_A); + if ((btnAPressed != sPostmanTimerInputBtnAPressed) && btnAPressed) { gSaveContext.timerOsTime = osGetTime(); - gSaveContext.timerState[TIMER_ID_0] = TIMER_STATE_15; + gSaveContext.timerState[TIMER_ID_POSTMAN] = TIMER_STATE_POSTMAN_STOP; } - D_801BFA84 = btnAPressed; + sPostmanTimerInputBtnAPressed = btnAPressed; } -void func_8010E9F0(s16 timerId, s16 timeLimit) { +void Interface_StartTimer(s16 timerId, s16 seconds) { gSaveContext.timerX[timerId] = 115; gSaveContext.timerY[timerId] = 80; - D_801BF8E0 = 0; + sEnvTimerActive = false; - gSaveContext.eventTimer1Value[timerId] = timeLimit * 100; - gSaveContext.eventTimer2Value[timerId] = gSaveContext.eventTimer1Value[timerId]; + gSaveContext.timerCurTime[timerId] = SECONDS_TO_TIMER(seconds); + gSaveContext.timerCurSubTime[timerId] = gSaveContext.timerCurTime[timerId]; - if (gSaveContext.eventTimer1Value[timerId] != 0) { - gSaveContext.timersNoTimeLimit[timerId] = false; + if (gSaveContext.timerCurTime[timerId] != SECONDS_TO_TIMER(0)) { + gSaveContext.timerDirection[timerId] = TIMER_COUNT_DOWN; } else { - gSaveContext.timersNoTimeLimit[timerId] = true; + gSaveContext.timerDirection[timerId] = TIMER_COUNT_UP; } gSaveContext.timerState[timerId] = TIMER_STATE_1; } -void func_8010EA9C(s16 timeLimit, s16 arg1) { - gSaveContext.timerX[TIMER_ID_0] = 115; - gSaveContext.timerY[TIMER_ID_0] = 80; +void Interface_StartPostmanTimer(s16 seconds, s16 bunnyHoodState) { + gSaveContext.timerX[TIMER_ID_POSTMAN] = 115; + gSaveContext.timerY[TIMER_ID_POSTMAN] = 80; - D_801BF8E4 = arg1; + sPostmanBunnyHoodState = bunnyHoodState; - gSaveContext.eventTimer1Value[TIMER_ID_0] = timeLimit * 100; - gSaveContext.eventTimer2Value[TIMER_ID_0] = gSaveContext.eventTimer1Value[TIMER_ID_0]; + gSaveContext.timerCurTime[TIMER_ID_POSTMAN] = SECONDS_TO_TIMER(seconds); + gSaveContext.timerCurSubTime[TIMER_ID_POSTMAN] = gSaveContext.timerCurTime[TIMER_ID_POSTMAN]; - if (gSaveContext.eventTimer1Value[TIMER_ID_0] != 0) { - gSaveContext.timersNoTimeLimit[TIMER_ID_0] = false; + if (gSaveContext.timerCurTime[TIMER_ID_POSTMAN] != SECONDS_TO_TIMER(0)) { + gSaveContext.timerDirection[TIMER_ID_POSTMAN] = TIMER_COUNT_DOWN; } else { - gSaveContext.timersNoTimeLimit[TIMER_ID_0] = true; + gSaveContext.timerDirection[TIMER_ID_POSTMAN] = TIMER_COUNT_UP; } - gSaveContext.timerState[TIMER_ID_0] = TIMER_STATE_13; + gSaveContext.timerState[TIMER_ID_POSTMAN] = TIMER_STATE_POSTMAN_START; - gSaveContext.funcTimer2Value[TIMER_ID_0] = 0; - gSaveContext.funcTimer3Value[TIMER_ID_0] = 0; + gSaveContext.timerEndOsTime[TIMER_ID_POSTMAN] = 0; + gSaveContext.timerPausedOsTime[TIMER_ID_POSTMAN] = 0; } -void func_8010EB50(s32 arg0) { - if (gSaveContext.timerState[TIMER_ID_6] != TIMER_STATE_OFF) { +// Unused, goron race actually uses TIMER_ID_4 +void Interface_StartGoronRaceTimer(s32 arg0) { + if (gSaveContext.timerState[TIMER_ID_GORON_RACE_UNUSED] != TIMER_STATE_OFF) { // Goron race started if (gSaveContext.eventInf[1] & 1) { - gSaveContext.eventTimer1Value[TIMER_ID_6] = 239; + gSaveContext.timerCurTime[TIMER_ID_GORON_RACE_UNUSED] = SECONDS_TO_TIMER_PRECISE(2, 39); } else { - gSaveContext.eventTimer1Value[TIMER_ID_6] = 1; + gSaveContext.timerCurTime[TIMER_ID_GORON_RACE_UNUSED] = SECONDS_TO_TIMER_PRECISE(0, 1); } } } -void func_8010EBA0(s16 timer, s16 timerId) { - gSaveContext.bottleStatus[timerId] = 1; - gSaveContext.bottleTimer3Value[timerId] = timer * 100; - gSaveContext.bottleTimer2Value[timerId] = gSaveContext.bottleTimer3Value[timerId]; - gSaveContext.bottleTimer1Value[timerId] = osGetTime(); - gSaveContext.bottleTimer4Value[timerId] = 0; - D_801BF8F0 = 0; +void Interface_StartBottleTimer(s16 seconds, s16 timerId) { + gSaveContext.bottleTimerState[timerId] = BOTTLE_TIMER_STATE_COUNTING; + gSaveContext.bottleTimerCurTime[timerId] = seconds * 100; + gSaveContext.bottleTimerCurSubTime[timerId] = gSaveContext.bottleTimerCurTime[timerId]; + gSaveContext.bottleTimerStartOsTime[timerId] = osGetTime(); + gSaveContext.bottleTimerPausedOsTime[timerId] = 0; + sBottleTimerPausedOsTime = 0; } -s32 func_8010EC54(s16 timerId) { +u32 Interface_GetCompressedTimerDigits(s16 timerId) { u64 time; s16 timerArr[6]; - time = gSaveContext.eventTimer1Value[timerId]; + time = gSaveContext.timerCurTime[timerId]; - // hours - timerArr[0] = time / 36000; - time -= timerArr[0] * 36000; + // 6 minutes + timerArr[0] = time / SECONDS_TO_TIMER(360); + time -= timerArr[0] * SECONDS_TO_TIMER(360); // minutes - timerArr[1] = time / 6000; - time -= timerArr[1] * 6000; + timerArr[1] = time / SECONDS_TO_TIMER(60); + time -= timerArr[1] * SECONDS_TO_TIMER(60); + + // 10 seconds + timerArr[2] = time / SECONDS_TO_TIMER(10); + time -= timerArr[2] * SECONDS_TO_TIMER(10); // seconds - timerArr[2] = time / 1000; - time -= timerArr[2] * 1000; + timerArr[3] = time / SECONDS_TO_TIMER(1); + time -= timerArr[3] * SECONDS_TO_TIMER(1); // 100 milliseconds - timerArr[3] = time / 100; - time -= timerArr[3] * 100; + timerArr[4] = time / SECONDS_TO_TIMER_PRECISE(0, 10); + time -= timerArr[4] * SECONDS_TO_TIMER_PRECISE(0, 10); // 10 milliseconds - timerArr[4] = time / 10; - time -= timerArr[4] * 10; - - // milliseconds timerArr[5] = time; return (timerArr[0] << 0x14) | (timerArr[1] << 0x10) | (timerArr[2] << 0xC) | (timerArr[3] << 8) | @@ -690,7 +693,7 @@ void Interface_NewDay(PlayState* play, s32 day) { s16 i = day - 1; // i is used to store dayMinusOne - if (i < 0 || i >= 3) { + if ((i < 0) || (i >= 3)) { i = 0; } @@ -1563,7 +1566,7 @@ void func_80110038(PlayState* play) { gSaveContext.buttonStatus[i] = BTN_DISABLED; } } else if (gSaveContext.eventInf[3] & 0x10) { - if (player->stateFlags3 & 0x1000000) { + if (player->stateFlags3 & PLAYER_STATE3_1000000) { if (gSaveContext.save.inventory.items[SLOT_NUT] == ITEM_NUT) { BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) = ITEM_NUT; Interface_LoadItemIconImpl(play, EQUIP_SLOT_B); @@ -1590,7 +1593,7 @@ void func_80110038(PlayState* play) { Interface_SetHudVisibility(HUD_VISIBILITY_A_B_MINIMAP); phi_t3 = false; } - } else if (player->stateFlags3 & 0x1000000) { + } else if (player->stateFlags3 & PLAYER_STATE3_1000000) { if (gSaveContext.save.inventory.items[SLOT_NUT] == ITEM_NUT) { if (BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) != ITEM_NUT) { BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) = ITEM_NUT; @@ -1613,7 +1616,8 @@ void func_80110038(PlayState* play) { BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) = ITEM_FD; gSaveContext.buttonStatus[EQUIP_SLOT_B] = BTN_DISABLED; } else { - if ((func_801242DC(play) >= 2) && (func_801242DC(play) < 5)) { + if ((Player_GetEnvTimerType(play) >= PLAYER_ENV_TIMER_UNDERWATER_FLOOR) && + (Player_GetEnvTimerType(play) <= PLAYER_ENV_TIMER_UNDERWATER_FREE)) { if (CUR_FORM != PLAYER_FORM_ZORA) { if ((player->currentMask == PLAYER_MASK_BLAST) && (player->unk_B60 == 0)) { if (gSaveContext.unk_1015 == 0xFF) { @@ -1641,9 +1645,9 @@ void func_80110038(PlayState* play) { for (i = EQUIP_SLOT_C_LEFT; i <= EQUIP_SLOT_C_RIGHT; i++) { if (GET_CUR_FORM_BTN_ITEM(i) != ITEM_MASK_ZORA) { - if (func_801242DC(play) == 2) { - if ((GET_CUR_FORM_BTN_ITEM(i) < ITEM_BOTTLE) || - (GET_CUR_FORM_BTN_ITEM(i) > ITEM_OBABA_DRINK)) { + if (Player_GetEnvTimerType(play) == PLAYER_ENV_TIMER_UNDERWATER_FLOOR) { + if (!((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_BOTTLE) && + (GET_CUR_FORM_BTN_ITEM(i) <= ITEM_OBABA_DRINK))) { if (gSaveContext.buttonStatus[i] == BTN_ENABLED) { phi_t3 = true; } @@ -1676,7 +1680,7 @@ void func_80110038(PlayState* play) { } } } else { - if (player->stateFlags1 & 0x200000) { + if (player->stateFlags1 & PLAYER_STATE1_200000) { for (i = EQUIP_SLOT_C_LEFT; i <= EQUIP_SLOT_C_RIGHT; i++) { if (GET_CUR_FORM_BTN_ITEM(i) != ITEM_LENS) { if (gSaveContext.buttonStatus[i] == BTN_ENABLED) { @@ -1695,7 +1699,7 @@ void func_80110038(PlayState* play) { gSaveContext.buttonStatus[EQUIP_SLOT_B] = BTN_DISABLED; phi_t3 = true; } - } else if (player->stateFlags1 & 0x2000) { + } else if (player->stateFlags1 & PLAYER_STATE1_2000) { if (gSaveContext.buttonStatus[EQUIP_SLOT_B] != BTN_DISABLED) { gSaveContext.buttonStatus[EQUIP_SLOT_B] = BTN_DISABLED; gSaveContext.buttonStatus[EQUIP_SLOT_C_LEFT] = BTN_DISABLED; @@ -1945,9 +1949,9 @@ void func_80111CB4(PlayState* play) { sp28 = false; if (gSaveContext.save.cutscene < 0xFFF0) { gSaveContext.hudVisibilityForceButtonAlphasByStatus = 0; - if ((player->stateFlags1 & 0x800000) || (gSaveContext.save.weekEventReg[8] & 1) || + if ((player->stateFlags1 & PLAYER_STATE1_800000) || (gSaveContext.save.weekEventReg[8] & 1) || (!(gSaveContext.eventInf[4] & 2) && (play->unk_1887C >= 2))) { - if ((player->stateFlags1 & 0x800000) && (player->currentMask == PLAYER_MASK_BLAST) && + if ((player->stateFlags1 & PLAYER_STATE1_800000) && (player->currentMask == PLAYER_MASK_BLAST) && (gSaveContext.unk_1015 == 0xFF)) { sp28 = true; gSaveContext.unk_1015 = 0; @@ -2028,12 +2032,12 @@ void func_80111CB4(PlayState* play) { gSaveContext.buttonStatus[EQUIP_SLOT_C_DOWN] = BTN_DISABLED; gSaveContext.buttonStatus[EQUIP_SLOT_C_RIGHT] = BTN_DISABLED; Interface_SetHudVisibility(HUD_VISIBILITY_A_B_MINIMAP); - } else if (player->stateFlags1 & 0x800000) { + } else if (player->stateFlags1 & PLAYER_STATE1_800000) { Interface_SetHudVisibility(HUD_VISIBILITY_A_B_MINIMAP); } } } else { - if (player->stateFlags1 & 0x800000) { + if (player->stateFlags1 & PLAYER_STATE1_800000) { Interface_SetHudVisibility(HUD_VISIBILITY_A_B_MINIMAP); } @@ -2085,7 +2089,7 @@ void func_80111CB4(PlayState* play) { gSaveContext.buttonStatus[EQUIP_SLOT_C_DOWN] = BTN_DISABLED; gSaveContext.buttonStatus[EQUIP_SLOT_C_RIGHT] = BTN_DISABLED; Interface_SetHudVisibility(HUD_VISIBILITY_A_B_MINIMAP); - } else if (player->stateFlags1 & 0x800000) { + } else if (player->stateFlags1 & PLAYER_STATE1_800000) { Interface_SetHudVisibility(HUD_VISIBILITY_A_B_MINIMAP); } } @@ -2116,7 +2120,7 @@ void func_80111CB4(PlayState* play) { } } else if ((D_801BF884 >= 2) && (Message_GetState(&play->msgCtx) == 4) && Message_ShouldAdvance(play)) { play->unk_18845 = 0; - player->stateFlags1 &= ~0x200; + player->stateFlags1 &= ~PLAYER_STATE1_200; func_801477B4(play); if (play->msgCtx.choiceIndex != 0) { func_8019F230(); @@ -2637,7 +2641,7 @@ u8 Item_Give(PlayState* play, u8 item) { for (i = BOTTLE_FIRST; i < BOTTLE_MAX; i++) { if (gSaveContext.save.inventory.items[slot + i] == ITEM_BOTTLE) { if (item == ITEM_HOT_SPRING_WATER) { - func_8010EBA0(60, i); + Interface_StartBottleTimer(60, i); } if ((slot + i) == C_SLOT_EQUIP(0, EQUIP_SLOT_C_LEFT)) { @@ -2951,7 +2955,7 @@ void Inventory_UpdateBottleItem(PlayState* play, u8 item, u8 btn) { gSaveContext.buttonStatus[btn] = BTN_ENABLED; if (item == ITEM_HOT_SPRING_WATER) { - func_8010EBA0(60, GET_CUR_FORM_BTN_SLOT(btn) - SLOT_BOTTLE_1); + Interface_StartBottleTimer(60, GET_CUR_FORM_BTN_SLOT(btn) - SLOT_BOTTLE_1); } } @@ -3508,7 +3512,8 @@ void Magic_Update(PlayState* play) { !Play_InCsMode(play)) { if ((gSaveContext.save.playerData.magic == 0) || - ((func_801242DC(play) >= 2) && (func_801242DC(play) < 5)) || + ((Player_GetEnvTimerType(play) >= PLAYER_ENV_TIMER_UNDERWATER_FLOOR) && + (Player_GetEnvTimerType(play) <= PLAYER_ENV_TIMER_UNDERWATER_FREE)) || ((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_LEFT) != ITEM_LENS) && (BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_DOWN) != ITEM_LENS) && (BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_RIGHT) != ITEM_LENS)) || @@ -3762,7 +3767,7 @@ void Interface_DrawItemButtons(PlayState* play) { (gSaveContext.hudVisibility == HUD_VISIBILITY_OFF_ALT) || (gSaveContext.hudVisibility == HUD_VISIBILITY_A_HEARTS_MAGIC_WITH_DIM_BTN) || (msgCtx->msgMode != 0)) { temp = 0; - } else if (player->stateFlags1 & 0x200000) { + } else if (player->stateFlags1 & PLAYER_STATE1_200000) { temp = 70; } else { temp = interfaceCtx->aAlpha; @@ -3900,7 +3905,7 @@ void func_80118084(PlayState* play) { gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 255, 255, 255, interfaceCtx->bAlpha); gDPSetCombineMode(OVERLAY_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); - if ((interfaceCtx->unk_222 == 0) && (player->stateFlags3 & 0x1000000)) { + if ((interfaceCtx->unk_222 == 0) && (player->stateFlags3 & PLAYER_STATE3_1000000)) { if (gSaveContext.buttonStatus[EQUIP_SLOT_B] != BTN_DISABLED) { Interface_DrawItemIconTexture(play, interfaceCtx->iconItemSegment, 0); gDPPipeSync(OVERLAY_DISP++); @@ -3918,7 +3923,7 @@ void func_80118084(PlayState* play) { if ((player->transformation == PLAYER_FORM_FIERCE_DEITY) || (player->transformation == PLAYER_FORM_HUMAN)) { if (BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) != ITEM_NONE) { Interface_DrawItemIconTexture(play, interfaceCtx->iconItemSegment, 0); - if ((player->stateFlags1 & 0x800000) || (gSaveContext.save.weekEventReg[8] & 1) || + if ((player->stateFlags1 & PLAYER_STATE1_800000) || (gSaveContext.save.weekEventReg[8] & 1) || (play->unk_1887C >= 2)) { gDPPipeSync(OVERLAY_DISP++); gDPSetCombineLERP(OVERLAY_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, @@ -5173,51 +5178,60 @@ void Interface_DrawMinigamePerfect(PlayState* play) { CLOSE_DISPS(play->state.gfxCtx); } -void func_8011C808(PlayState* play) { +void Interface_StartMoonCrash(PlayState* play) { if (play->actorCtx.unk5 & 2) { Audio_QueueSeqCmd(0xE0000100); } gSaveContext.save.day = 4; gSaveContext.save.daysElapsed = 4; - gSaveContext.save.time = 0x400A; + gSaveContext.save.time = CLOCK_TIME(6, 0) + 10; play->nextEntrance = ENTRANCE(TERMINA_FIELD, 12); gSaveContext.nextCutsceneIndex = 0; play->transitionTrigger = TRANS_TRIGGER_START; play->transitionType = TRANS_TYPE_03; } -void func_8011C898(u64 timer, s16* timerArr) { +void Interface_GetTimerDigits(u64 timer, s16* timerArr) { u64 time = timer; - // hours - timerArr[0] = time / 36000; - time -= timerArr[0] * 36000; + // 6 minutes + timerArr[0] = time / SECONDS_TO_TIMER(360); + time -= timerArr[0] * SECONDS_TO_TIMER(360); // minutes - timerArr[1] = time / 6000; - time -= timerArr[1] * 6000; + timerArr[1] = time / SECONDS_TO_TIMER(60); + time -= timerArr[1] * SECONDS_TO_TIMER(60); + + // 10 seconds + timerArr[3] = time / SECONDS_TO_TIMER(10); + time -= timerArr[3] * SECONDS_TO_TIMER(10); // seconds - timerArr[3] = time / 1000; - time -= timerArr[3] * 1000; + timerArr[4] = time / SECONDS_TO_TIMER(1); + time -= timerArr[4] * SECONDS_TO_TIMER(1); // 100 milliseconds - timerArr[4] = time / 100; - time -= timerArr[4] * 100; + timerArr[6] = time / SECONDS_TO_TIMER_PRECISE(0, 10); + time -= timerArr[6] * SECONDS_TO_TIMER_PRECISE(0, 10); // 10 milliseconds - timerArr[6] = time / 10; - time -= timerArr[6] * 10; - - // milliseconds timerArr[7] = time; } +#define IS_POSTMAN_TIMER_DRAWN \ + (((sTimerId == TIMER_ID_POSTMAN) && (gSaveContext.timerState[TIMER_ID_POSTMAN] == TIMER_STATE_POSTMAN_COUNTING) && \ + (sPostmanBunnyHoodState == POSTMAN_MINIGAME_BUNNY_HOOD_OFF) && \ + (gSaveContext.timerCurTime[TIMER_ID_POSTMAN] < SECONDS_TO_TIMER(3))) || \ + (sPostmanBunnyHoodState == POSTMAN_MINIGAME_BUNNY_HOOD_ON)) + +/** + * Update and draw the timers + */ void Interface_DrawTimers(PlayState* play) { - static s16 D_801BFCE4 = 0; - static s16 D_801BFCE8[] = { 0, 0, 0, 0, 0, 0, 0, 0 }; - static s16 D_801BFCF8 = 0x63; + static s16 sTimerStateTimer = 0; + static s16 sTimerDigits[] = { 0, 0, 0, 0, 0, 0, 0, 0 }; + static s16 sTimerBeepSfxSeconds = 99; static s16 D_801BFCFC[] = { // timer digit width 0x10, 0x19, 0x22, 0x2A, 0x33, 0x3C, 0x44, 0x4D, @@ -5229,74 +5243,78 @@ void Interface_DrawTimers(PlayState* play) { InterfaceContext* interfaceCtx = &play->interfaceCtx; MessageContext* msgCtx = &play->msgCtx; Player* player = GET_PLAYER(play); - OSTime spD0; - OSTime spCC; + OSTime osTime; + OSTime timerOsTime; s16 j; s16 i; OPEN_DISPS(play->state.gfxCtx); + // Not satisfying any of these conditions will pause the timer if ((play->pauseCtx.state == 0) && (play->pauseCtx.debugEditor == DEBUG_EDITOR_NONE) && (play->gameOverCtx.state == GAMEOVER_INACTIVE) && ((msgCtx->msgMode == 0) || ((msgCtx->msgMode != 0) && (msgCtx->currentTextId >= 0x1BB2) && (msgCtx->currentTextId <= 0x1BB6))) && - !(player->stateFlags1 & 0x200) && (play->transitionTrigger == TRANS_TRIGGER_OFF) && + !(player->stateFlags1 & PLAYER_STATE1_200) && (play->transitionTrigger == TRANS_TRIGGER_OFF) && (play->transitionMode == TRANS_MODE_OFF) && !Play_InCsMode(play)) { - if (D_801BF968) { - spD0 = osGetTime(); + // Account for osTime when the timer is paused + if (sIsTimerPaused) { + osTime = osGetTime(); - for (j = 0; j < 7; j++) { + for (j = 0; j < TIMER_ID_MAX; j++) { if (gSaveContext.timerState[j] == TIMER_STATE_4) { - gSaveContext.funcTimer3Value[j] = gSaveContext.funcTimer3Value[j] + (spD0 - D_801BF8E8); + gSaveContext.timerPausedOsTime[j] = + gSaveContext.timerPausedOsTime[j] + (osTime - sTimerPausedOsTime); } } - - D_801BF968 = false; + sIsTimerPaused = false; } sTimerId = TIMER_ID_NONE; - for (i = 0; i < 7; i++) { + // Process all active timers + for (i = 0; i < TIMER_ID_MAX; i++) { if (gSaveContext.timerState[i] == TIMER_STATE_OFF) { continue; } sTimerId = i; - if (sTimerId == TIMER_ID_0) { - switch (gSaveContext.timerState[TIMER_ID_0]) { - case TIMER_STATE_13: - if (gSaveContext.timersNoTimeLimit[TIMER_ID_0]) { - gSaveContext.funcTimer1Value[TIMER_ID_0] = osGetTime(); + // Process the timer for the postman counting minigame + if (sTimerId == TIMER_ID_POSTMAN) { + switch (gSaveContext.timerState[TIMER_ID_POSTMAN]) { + case TIMER_STATE_POSTMAN_START: + if (gSaveContext.timerDirection[TIMER_ID_POSTMAN] != TIMER_COUNT_DOWN) { + gSaveContext.timerStartOsTime[TIMER_ID_POSTMAN] = osGetTime(); } - gSaveContext.timerState[TIMER_ID_0] = TIMER_STATE_14; - D_801BFA84 = 1; - func_80174F7C(Interface_TimerCallback, NULL); + gSaveContext.timerState[TIMER_ID_POSTMAN] = TIMER_STATE_POSTMAN_COUNTING; + sPostmanTimerInputBtnAPressed = true; + func_80174F7C(Interface_PostmanTimerCallback, NULL); break; - case TIMER_STATE_15: - spCC = gSaveContext.timerOsTime; - gSaveContext.eventTimer1Value[TIMER_ID_0] = - (spCC - ((void)0, gSaveContext.funcTimer1Value[TIMER_ID_0]) - - ((void)0, gSaveContext.funcTimer3Value[TIMER_ID_0])) * + case TIMER_STATE_POSTMAN_STOP: + timerOsTime = gSaveContext.timerOsTime; + gSaveContext.timerCurTime[TIMER_ID_POSTMAN] = + (timerOsTime - ((void)0, gSaveContext.timerStartOsTime[TIMER_ID_POSTMAN]) - + ((void)0, gSaveContext.timerPausedOsTime[TIMER_ID_POSTMAN])) * 64 / 3000 / 10000; - gSaveContext.timerState[TIMER_ID_0] = TIMER_STATE_16; - - func_80174F9C(Interface_TimerCallback, NULL); + gSaveContext.timerState[TIMER_ID_POSTMAN] = TIMER_STATE_POSTMAN_END; + func_80174F9C(Interface_PostmanTimerCallback, NULL); break; - case TIMER_STATE_14: - case TIMER_STATE_16: + case TIMER_STATE_POSTMAN_COUNTING: + case TIMER_STATE_POSTMAN_END: break; } break; } + // process the remaining timers switch (gSaveContext.timerState[sTimerId]) { case TIMER_STATE_1: case TIMER_STATE_9: - D_801BFCE4 = 20; + sTimerStateTimer = 20; if (interfaceCtx->minigameState != MINIGAME_STATE_NONE) { gSaveContext.timerX[sTimerId] = 26; @@ -5318,9 +5336,9 @@ void Interface_DrawTimers(PlayState* play) { D_801BF930[sTimerId] = 0; } - gSaveContext.funcTimer1Value[sTimerId] = osGetTime(); - gSaveContext.funcTimer2Value[sTimerId] = 0; - gSaveContext.funcTimer3Value[sTimerId] = 0; + gSaveContext.timerStartOsTime[sTimerId] = osGetTime(); + gSaveContext.timerEndOsTime[sTimerId] = 0; + gSaveContext.timerPausedOsTime[sTimerId] = 0; } } else { gSaveContext.timerState[sTimerId] = TIMER_STATE_2; @@ -5328,35 +5346,35 @@ void Interface_DrawTimers(PlayState* play) { break; case TIMER_STATE_2: - D_801BFCE4--; - if (D_801BFCE4 == 0) { - D_801BFCE4 = 20; - gSaveContext.timerState[sTimerId] = TIMER_STATE_3; + sTimerStateTimer--; + if (sTimerStateTimer == 0) { + sTimerStateTimer = 20; + gSaveContext.timerState[sTimerId] = TIMER_STATE_MOVING_TIMER; } break; - case TIMER_STATE_3: - if (sTimerId == TIMER_ID_3) { - j = ((((void)0, gSaveContext.timerX[sTimerId]) - XREG(81)) / D_801BFCE4); + case TIMER_STATE_MOVING_TIMER: + if (sTimerId == TIMER_ID_FINAL_HOURS) { + j = ((((void)0, gSaveContext.timerX[sTimerId]) - R_FINAL_HOURS_TIMER_X) / sTimerStateTimer); gSaveContext.timerX[sTimerId] = ((void)0, gSaveContext.timerX[sTimerId]) - j; - j = ((((void)0, gSaveContext.timerY[sTimerId]) - XREG(80)) / D_801BFCE4); + j = ((((void)0, gSaveContext.timerY[sTimerId]) - R_FINAL_HOURS_TIMER_Y) / sTimerStateTimer); gSaveContext.timerY[sTimerId] = ((void)0, gSaveContext.timerY[sTimerId]) - j; } else { - j = ((((void)0, gSaveContext.timerX[sTimerId]) - 26) / D_801BFCE4); + j = ((((void)0, gSaveContext.timerX[sTimerId]) - 26) / sTimerStateTimer); gSaveContext.timerX[sTimerId] = ((void)0, gSaveContext.timerX[sTimerId]) - j; j = (gSaveContext.save.playerData.healthCapacity > 0xA0) - ? ((((void)0, gSaveContext.timerY[sTimerId]) - 54) / D_801BFCE4) - : ((((void)0, gSaveContext.timerY[sTimerId]) - 46) / D_801BFCE4); + ? ((((void)0, gSaveContext.timerY[sTimerId]) - 54) / sTimerStateTimer) + : ((((void)0, gSaveContext.timerY[sTimerId]) - 46) / sTimerStateTimer); gSaveContext.timerY[sTimerId] = ((void)0, gSaveContext.timerY[sTimerId]) - j; } - D_801BFCE4--; - if (D_801BFCE4 == 0) { - D_801BFCE4 = 20; + sTimerStateTimer--; + if (sTimerStateTimer == 0) { + sTimerStateTimer = 20; - if (sTimerId == TIMER_ID_3) { - gSaveContext.timerY[sTimerId] = XREG(80); + if (sTimerId == TIMER_ID_FINAL_HOURS) { + gSaveContext.timerY[sTimerId] = R_FINAL_HOURS_TIMER_Y; } else { gSaveContext.timerX[sTimerId] = 26; if (gSaveContext.save.playerData.healthCapacity > 0xA0) { @@ -5367,15 +5385,15 @@ void Interface_DrawTimers(PlayState* play) { } gSaveContext.timerState[sTimerId] = TIMER_STATE_4; - gSaveContext.funcTimer1Value[sTimerId] = osGetTime(); - gSaveContext.funcTimer2Value[sTimerId] = 0; - gSaveContext.funcTimer3Value[sTimerId] = 0; + gSaveContext.timerStartOsTime[sTimerId] = osGetTime(); + gSaveContext.timerEndOsTime[sTimerId] = 0; + gSaveContext.timerPausedOsTime[sTimerId] = 0; } // fallthrough case TIMER_STATE_4: - if ((gSaveContext.timerState[sTimerId] == TIMER_STATE_4) && (sTimerId == TIMER_ID_3)) { - gSaveContext.timerX[TIMER_ID_3] = XREG(81); - gSaveContext.timerY[TIMER_ID_3] = XREG(80); + if ((gSaveContext.timerState[sTimerId] == TIMER_STATE_4) && (sTimerId == TIMER_ID_FINAL_HOURS)) { + gSaveContext.timerX[TIMER_ID_FINAL_HOURS] = R_FINAL_HOURS_TIMER_X; + gSaveContext.timerY[TIMER_ID_FINAL_HOURS] = R_FINAL_HOURS_TIMER_Y; } break; @@ -5389,73 +5407,75 @@ void Interface_DrawTimers(PlayState* play) { break; case TIMER_STATE_12: - spD0 = osGetTime(); + osTime = osGetTime(); - gSaveContext.funcTimer3Value[sTimerId] = - gSaveContext.funcTimer3Value[sTimerId] + spD0 - D_801BF8F8[sTimerId]; + gSaveContext.timerPausedOsTime[sTimerId] = + gSaveContext.timerPausedOsTime[sTimerId] + osTime - D_801BF8F8[sTimerId]; D_801BF930[sTimerId] = 0; gSaveContext.timerState[sTimerId] = TIMER_STATE_4; break; - case TIMER_STATE_8: - gSaveContext.eventTimer1Value[sTimerId] = (gSaveContext.save.playerData.health >> 1) * 100; - gSaveContext.timersNoTimeLimit[sTimerId] = false; - gSaveContext.eventTimer2Value[sTimerId] = gSaveContext.eventTimer1Value[sTimerId]; - D_801BFCE4 = 20; - gSaveContext.timerState[sTimerId] = TIMER_STATE_3; + case TIMER_STATE_ENV_START: + gSaveContext.timerCurTime[sTimerId] = SECONDS_TO_TIMER(gSaveContext.save.playerData.health >> 1); + gSaveContext.timerDirection[sTimerId] = TIMER_COUNT_DOWN; + gSaveContext.timerCurSubTime[sTimerId] = gSaveContext.timerCurTime[sTimerId]; + sTimerStateTimer = 20; + gSaveContext.timerState[sTimerId] = TIMER_STATE_MOVING_TIMER; break; - case TIMER_STATE_5: - spD0 = osGetTime(); + case TIMER_STATE_STOP: + osTime = osGetTime(); - gSaveContext.funcTimer2Value[sTimerId] = (spD0 - ((void)0, gSaveContext.funcTimer1Value[sTimerId]) - - ((void)0, gSaveContext.funcTimer3Value[sTimerId])) * - 64 / 3000 / 10000; + gSaveContext.timerEndOsTime[sTimerId] = + (osTime - ((void)0, gSaveContext.timerStartOsTime[sTimerId]) - + ((void)0, gSaveContext.timerPausedOsTime[sTimerId])) * + 64 / 3000 / 10000; gSaveContext.timerState[sTimerId] = TIMER_STATE_OFF; - if (sTimerId == TIMER_ID_3) { + if (sTimerId == TIMER_ID_FINAL_HOURS) { gSaveContext.save.day = 4; if ((play->sceneNum == SCENE_OKUJOU) && (gSaveContext.sceneSetupIndex == 3)) { play->nextEntrance = ENTRANCE(TERMINA_FIELD, 1); gSaveContext.nextCutsceneIndex = 0xFFF0; play->transitionTrigger = TRANS_TRIGGER_START; } else { - func_8011C808(play); + Interface_StartMoonCrash(play); } - } else if (gSaveContext.timerState[TIMER_ID_6] != TIMER_STATE_OFF) { - gSaveContext.timerX[TIMER_ID_6] = 115; - gSaveContext.timerY[TIMER_ID_6] = 80; - if (gSaveContext.timerState[TIMER_ID_6] <= TIMER_STATE_10) { - gSaveContext.timerState[TIMER_ID_6] = TIMER_STATE_3; + } else if (gSaveContext.timerState[TIMER_ID_GORON_RACE_UNUSED] != TIMER_STATE_OFF) { + gSaveContext.timerX[TIMER_ID_GORON_RACE_UNUSED] = 115; + gSaveContext.timerY[TIMER_ID_GORON_RACE_UNUSED] = 80; + if (gSaveContext.timerState[TIMER_ID_GORON_RACE_UNUSED] <= TIMER_STATE_10) { + gSaveContext.timerState[TIMER_ID_GORON_RACE_UNUSED] = TIMER_STATE_MOVING_TIMER; } } break; case TIMER_STATE_6: - spD0 = osGetTime(); + osTime = osGetTime(); - gSaveContext.funcTimer2Value[sTimerId] = (spD0 - ((void)0, gSaveContext.funcTimer1Value[sTimerId]) - - ((void)0, gSaveContext.funcTimer3Value[sTimerId])) * - 64 / 3000 / 10000; + gSaveContext.timerEndOsTime[sTimerId] = + (osTime - ((void)0, gSaveContext.timerStartOsTime[sTimerId]) - + ((void)0, gSaveContext.timerPausedOsTime[sTimerId])) * + 64 / 3000 / 10000; if ((gSaveContext.minigameState == 1) && (gSaveContext.save.entrance == ENTRANCE(ROMANI_RANCH, 0))) { - if (gSaveContext.funcTimer2Value[sTimerId] >= 12000) { - gSaveContext.funcTimer2Value[sTimerId] = 12000; - gSaveContext.eventTimer1Value[sTimerId] = 12000; + if (gSaveContext.timerEndOsTime[sTimerId] >= SECONDS_TO_TIMER(120)) { + gSaveContext.timerEndOsTime[sTimerId] = SECONDS_TO_TIMER(120); + gSaveContext.timerCurTime[sTimerId] = SECONDS_TO_TIMER(120); } } else if ((gSaveContext.eventInf[3] & 0x10) && (play->sceneNum == SCENE_DEKUTES) && - (gSaveContext.funcTimer2Value[sTimerId] >= 12000)) { - gSaveContext.eventTimer1Value[sTimerId] = 12000; + (gSaveContext.timerEndOsTime[sTimerId] >= SECONDS_TO_TIMER(120))) { + gSaveContext.timerCurTime[sTimerId] = SECONDS_TO_TIMER(120); } gSaveContext.timerState[sTimerId] = TIMER_STATE_7; - if (gSaveContext.timerState[TIMER_ID_6] != TIMER_STATE_OFF) { - gSaveContext.timerX[TIMER_ID_6] = 115; - gSaveContext.timerY[TIMER_ID_6] = 80; - if (gSaveContext.timerState[TIMER_ID_6] <= TIMER_STATE_10) { - gSaveContext.timerState[TIMER_ID_6] = TIMER_STATE_3; + if (gSaveContext.timerState[TIMER_ID_GORON_RACE_UNUSED] != TIMER_STATE_OFF) { + gSaveContext.timerX[TIMER_ID_GORON_RACE_UNUSED] = 115; + gSaveContext.timerY[TIMER_ID_GORON_RACE_UNUSED] = 80; + if (gSaveContext.timerState[TIMER_ID_GORON_RACE_UNUSED] <= TIMER_STATE_10) { + gSaveContext.timerState[TIMER_ID_GORON_RACE_UNUSED] = TIMER_STATE_MOVING_TIMER; } gSaveContext.timerState[sTimerId] = TIMER_STATE_OFF; } @@ -5465,100 +5485,106 @@ void Interface_DrawTimers(PlayState* play) { } if ((sTimerId != TIMER_ID_NONE) && gSaveContext.timerState[sTimerId]) { // != TIMER_STATE_OFF - if (!gSaveContext.timersNoTimeLimit[sTimerId]) { - D_801BFCE8[0] = D_801BFCE8[1] = D_801BFCE8[3] = D_801BFCE8[4] = D_801BFCE8[6] = 0; - D_801BFCE8[2] = D_801BFCE8[5] = 10; + if (gSaveContext.timerDirection[sTimerId] == TIMER_COUNT_DOWN) { + sTimerDigits[0] = sTimerDigits[1] = sTimerDigits[3] = sTimerDigits[4] = sTimerDigits[6] = 0; + + // used to index the counter colon + sTimerDigits[2] = sTimerDigits[5] = 10; + if ((gSaveContext.timerState[sTimerId] == TIMER_STATE_4) || (gSaveContext.timerState[sTimerId] == TIMER_STATE_10) || (gSaveContext.timerState[sTimerId] == TIMER_STATE_11) || - (gSaveContext.timerState[sTimerId] == TIMER_STATE_14)) { - spD0 = osGetTime(); - spD0 = (spD0 - ((void)0, gSaveContext.funcTimer3Value[sTimerId]) - D_801BF930[sTimerId] - - ((void)0, gSaveContext.funcTimer1Value[sTimerId])) * - 64 / 3000 / 10000; + (gSaveContext.timerState[sTimerId] == TIMER_STATE_POSTMAN_COUNTING)) { + osTime = osGetTime(); + osTime = (osTime - ((void)0, gSaveContext.timerPausedOsTime[sTimerId]) - D_801BF930[sTimerId] - + ((void)0, gSaveContext.timerStartOsTime[sTimerId])) * + 64 / 3000 / 10000; + } else if (gSaveContext.timerState[sTimerId] == TIMER_STATE_7) { + osTime = gSaveContext.timerEndOsTime[sTimerId]; } else { - if (gSaveContext.timerState[sTimerId] == TIMER_STATE_7) { - spD0 = gSaveContext.funcTimer2Value[sTimerId]; - } else { - spD0 = 0; - } + osTime = 0; } - if (spD0 == 0) { - gSaveContext.eventTimer1Value[sTimerId] = gSaveContext.eventTimer2Value[sTimerId] - spD0; - } else if (gSaveContext.eventTimer2Value[sTimerId] >= spD0) { - if (gSaveContext.eventTimer2Value[sTimerId] <= spD0) { - gSaveContext.eventTimer1Value[sTimerId] = 0; + if (osTime == 0) { + gSaveContext.timerCurTime[sTimerId] = gSaveContext.timerCurSubTime[sTimerId] - osTime; + } else if (gSaveContext.timerCurSubTime[sTimerId] >= osTime) { + if (gSaveContext.timerCurSubTime[sTimerId] <= osTime) { + gSaveContext.timerCurTime[sTimerId] = SECONDS_TO_TIMER(0); } else { - gSaveContext.eventTimer1Value[sTimerId] = gSaveContext.eventTimer2Value[sTimerId] - spD0; + gSaveContext.timerCurTime[sTimerId] = gSaveContext.timerCurSubTime[sTimerId] - osTime; } } else { - gSaveContext.eventTimer1Value[sTimerId] = 0; - gSaveContext.timerState[sTimerId] = TIMER_STATE_5; - if (D_801BF8E0 != 0) { + gSaveContext.timerCurTime[sTimerId] = SECONDS_TO_TIMER(0); + gSaveContext.timerState[sTimerId] = TIMER_STATE_STOP; + if (sEnvTimerActive) { gSaveContext.save.playerData.health = 0; play->damagePlayer(play, -(((void)0, gSaveContext.save.playerData.health) + 2)); } - D_801BF8E0 = 0; + sEnvTimerActive = false; } - func_8011C898(((void)0, gSaveContext.eventTimer1Value[sTimerId]), D_801BFCE8); + Interface_GetTimerDigits(((void)0, gSaveContext.timerCurTime[sTimerId]), sTimerDigits); - if (gSaveContext.eventTimer1Value[sTimerId] > 6000) { - if ((D_801BFCF8 != D_801BFCE8[4]) && (D_801BFCE8[4] == 1)) { + // Use seconds to determine when to beep + if (gSaveContext.timerCurTime[sTimerId] > SECONDS_TO_TIMER(60)) { + if ((sTimerBeepSfxSeconds != sTimerDigits[4]) && (sTimerDigits[4] == 1)) { play_sound(NA_SE_SY_MESSAGE_WOMAN); - D_801BFCF8 = D_801BFCE8[4]; + sTimerBeepSfxSeconds = sTimerDigits[4]; } - } else if (gSaveContext.eventTimer1Value[sTimerId] > 1000) { - if ((D_801BFCF8 != D_801BFCE8[4]) && ((D_801BFCE8[4] % 2) != 0)) { + } else if (gSaveContext.timerCurTime[sTimerId] > SECONDS_TO_TIMER(10)) { + if ((sTimerBeepSfxSeconds != sTimerDigits[4]) && ((sTimerDigits[4] % 2) != 0)) { play_sound(NA_SE_SY_WARNING_COUNT_N); - D_801BFCF8 = D_801BFCE8[4]; + sTimerBeepSfxSeconds = sTimerDigits[4]; } - } else if (D_801BFCF8 != D_801BFCE8[4]) { + } else if (sTimerBeepSfxSeconds != sTimerDigits[4]) { play_sound(NA_SE_SY_WARNING_COUNT_E); - D_801BFCF8 = D_801BFCE8[4]; + sTimerBeepSfxSeconds = sTimerDigits[4]; } - } else { - D_801BFCE8[0] = D_801BFCE8[1] = D_801BFCE8[3] = D_801BFCE8[4] = D_801BFCE8[6] = 0; - D_801BFCE8[2] = D_801BFCE8[5] = 10; + } else { // TIMER_COUNT_UP + sTimerDigits[0] = sTimerDigits[1] = sTimerDigits[3] = sTimerDigits[4] = sTimerDigits[6] = 0; + + // used to index the counter colon + sTimerDigits[2] = sTimerDigits[5] = 10; if ((gSaveContext.timerState[sTimerId] == TIMER_STATE_4) || - (gSaveContext.timerState[sTimerId] == TIMER_STATE_14)) { - spD0 = osGetTime(); - spD0 = (spD0 - ((void)0, gSaveContext.funcTimer1Value[sTimerId]) - - ((void)0, gSaveContext.funcTimer3Value[sTimerId]) - D_801BF930[sTimerId]) * - 64 / 3000 / 10000; + (gSaveContext.timerState[sTimerId] == TIMER_STATE_POSTMAN_COUNTING)) { + osTime = osGetTime(); + osTime = (osTime - ((void)0, gSaveContext.timerStartOsTime[sTimerId]) - + ((void)0, gSaveContext.timerPausedOsTime[sTimerId]) - D_801BF930[sTimerId]) * + 64 / 3000 / 10000; } else if (gSaveContext.timerState[sTimerId] == TIMER_STATE_7) { - spD0 = gSaveContext.funcTimer2Value[sTimerId]; - } else if (sTimerId == TIMER_ID_0) { - spD0 = gSaveContext.eventTimer1Value[sTimerId]; + osTime = gSaveContext.timerEndOsTime[sTimerId]; + } else if (sTimerId == TIMER_ID_POSTMAN) { + osTime = gSaveContext.timerCurTime[sTimerId]; } else { - spD0 = 0; + osTime = SECONDS_TO_TIMER(0); } if ((gSaveContext.minigameState == 1) && (gSaveContext.save.entrance == ENTRANCE(ROMANI_RANCH, 0))) { - if (spD0 >= 12000) { - spD0 = 12000; + if (osTime >= SECONDS_TO_TIMER(120)) { + osTime = SECONDS_TO_TIMER(120); } - } else if ((gSaveContext.eventInf[3] & 0x10) && (play->sceneNum == SCENE_DEKUTES) && (spD0 >= 12000)) { - spD0 = 12000; + } else if ((gSaveContext.eventInf[3] & 0x10) && (play->sceneNum == SCENE_DEKUTES) && + (osTime >= SECONDS_TO_TIMER(120))) { + osTime = SECONDS_TO_TIMER(120); } - gSaveContext.eventTimer1Value[sTimerId] = spD0; + gSaveContext.timerCurTime[sTimerId] = osTime; - func_8011C898(spD0, D_801BFCE8); + Interface_GetTimerDigits(osTime, sTimerDigits); + // Use seconds to determine when to beep if ((gSaveContext.minigameState == 1) && (gSaveContext.save.entrance == ENTRANCE(ROMANI_RANCH, 0))) { - if ((gSaveContext.eventTimer1Value[sTimerId] > 11000) && (D_801BFCF8 != D_801BFCE8[4])) { + if ((gSaveContext.timerCurTime[sTimerId] > 11000) && (sTimerBeepSfxSeconds != sTimerDigits[4])) { play_sound(NA_SE_SY_WARNING_COUNT_E); - D_801BFCF8 = D_801BFCE8[4]; + sTimerBeepSfxSeconds = sTimerDigits[4]; } } else if ((gSaveContext.eventInf[3] & 0x10) && (play->sceneNum == SCENE_DEKUTES)) { - if ((((void)0, gSaveContext.eventTimer1Value[sTimerId]) > - (gSaveContext.save.dekuPlaygroundHighScores[CURRENT_DAY - 1] - 900)) && - (D_801BFCF8 != D_801BFCE8[4])) { + if ((((void)0, gSaveContext.timerCurTime[sTimerId]) > + (gSaveContext.save.dekuPlaygroundHighScores[CURRENT_DAY - 1] - SECONDS_TO_TIMER(9))) && + (sTimerBeepSfxSeconds != sTimerDigits[4])) { play_sound(NA_SE_SY_WARNING_COUNT_E); - D_801BFCF8 = D_801BFCE8[4]; + sTimerBeepSfxSeconds = sTimerDigits[4]; } } } @@ -5573,12 +5599,11 @@ void Interface_DrawTimers(PlayState* play) { gDPSetCombineLERP(OVERLAY_DISP++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0); - if (((sTimerId == TIMER_ID_0) && (gSaveContext.timerState[TIMER_ID_0] == TIMER_STATE_14) && - (D_801BF8E4 == 0) && (gSaveContext.eventTimer1Value[TIMER_ID_0] < 300)) || - (D_801BF8E4 == 2) || (gSaveContext.timerState[sTimerId] <= TIMER_STATE_12)) { - if (gSaveContext.timerState[sTimerId]) { // TODO: No != 0 + // Set the timer color + if (IS_POSTMAN_TIMER_DRAWN || (gSaveContext.timerState[sTimerId] <= TIMER_STATE_12)) { + if (gSaveContext.timerState[sTimerId]) { // != TIMER_STATE_OFF if (sTimerId == TIMER_ID_2) { - if ((gSaveContext.eventTimer1Value[sTimerId] == 0) || + if ((gSaveContext.timerCurTime[sTimerId] == SECONDS_TO_TIMER(0)) || (gSaveContext.timerState[sTimerId] == TIMER_STATE_4)) { gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 255, 50, 0, 255); } else { @@ -5586,23 +5611,24 @@ void Interface_DrawTimers(PlayState* play) { } } else if ((gSaveContext.minigameState == 1) && (gSaveContext.save.entrance == ENTRANCE(ROMANI_RANCH, 0))) { - if (gSaveContext.eventTimer1Value[sTimerId] >= 11000) { + if (gSaveContext.timerCurTime[sTimerId] >= SECONDS_TO_TIMER(110)) { gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 255, 50, 0, 255); } else { gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 255, 255, 255, 255); } } else if ((gSaveContext.eventInf[3] & 0x10) && (play->sceneNum == SCENE_DEKUTES)) { - if (((void)0, gSaveContext.eventTimer1Value[sTimerId]) >= + if (((void)0, gSaveContext.timerCurTime[sTimerId]) >= gSaveContext.save.dekuPlaygroundHighScores[CURRENT_DAY - 1]) { gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 255, 50, 0, 255); - } else if (((void)0, gSaveContext.eventTimer1Value[sTimerId]) >= - (gSaveContext.save.dekuPlaygroundHighScores[CURRENT_DAY - 1] - 900)) { + } else if (((void)0, gSaveContext.timerCurTime[sTimerId]) >= + (gSaveContext.save.dekuPlaygroundHighScores[CURRENT_DAY - 1] - + SECONDS_TO_TIMER(9))) { gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 255, 255, 0, 255); } else { gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 255, 255, 255, 255); } - } else if ((gSaveContext.eventTimer1Value[sTimerId] < 1000) && - !gSaveContext.timersNoTimeLimit[sTimerId] && + } else if ((gSaveContext.timerCurTime[sTimerId] < SECONDS_TO_TIMER(10)) && + (gSaveContext.timerDirection[sTimerId] == TIMER_COUNT_DOWN) && (gSaveContext.timerState[sTimerId] != TIMER_STATE_11)) { gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 255, 50, 0, 255); } else { @@ -5610,26 +5636,30 @@ void Interface_DrawTimers(PlayState* play) { } } - if (sTimerId == TIMER_ID_0) { - if (D_801BF8E4 == 2) { + // Draw the timer + if (sTimerId == TIMER_ID_POSTMAN) { + if (sPostmanBunnyHoodState == POSTMAN_MINIGAME_BUNNY_HOOD_ON) { + // draw sTimerDigits[3] (10s of seconds) to sTimerDigits[6] (100s of milliseconds) for (j = 0; j < 4; j++) { OVERLAY_DISP = Gfx_TextureI8( - OVERLAY_DISP, ((u8*)gCounterDigit0Tex + (8 * 16 * D_801BFCE8[j + 3])), 8, 0x10, + OVERLAY_DISP, ((u8*)gCounterDigit0Tex + (8 * 16 * sTimerDigits[j + 3])), 8, 0x10, ((void)0, gSaveContext.timerX[sTimerId]) + D_801BFCFC[j], ((void)0, gSaveContext.timerY[sTimerId]), D_801BFD0C[j], 0xFA, 0x370, 0x370); } } else { + // draw sTimerDigits[3] (10s of seconds) to sTimerDigits[7] (10s of milliseconds) for (j = 0; j < 5; j++) { OVERLAY_DISP = Gfx_TextureI8( - OVERLAY_DISP, ((u8*)gCounterDigit0Tex + (8 * 16 * D_801BFCE8[j + 3])), 8, 0x10, + OVERLAY_DISP, ((u8*)gCounterDigit0Tex + (8 * 16 * sTimerDigits[j + 3])), 8, 0x10, ((void)0, gSaveContext.timerX[sTimerId]) + D_801BFCFC[j], ((void)0, gSaveContext.timerY[sTimerId]), D_801BFD0C[j], 0xFA, 0x370, 0x370); } } } else { + // draw sTimerDigits[3] (6s of minutes) to sTimerDigits[7] (10s of milliseconds) for (j = 0; j < 8; j++) { OVERLAY_DISP = - Gfx_TextureI8(OVERLAY_DISP, ((u8*)gCounterDigit0Tex + (8 * 16 * D_801BFCE8[j])), 8, 0x10, + Gfx_TextureI8(OVERLAY_DISP, ((u8*)gCounterDigit0Tex + (8 * 16 * sTimerDigits[j])), 8, 0x10, ((void)0, gSaveContext.timerX[sTimerId]) + D_801BFCFC[j], ((void)0, gSaveContext.timerY[sTimerId]), D_801BFD0C[j], 0xFA, 0x370, 0x370); } @@ -5637,21 +5667,22 @@ void Interface_DrawTimers(PlayState* play) { } } - } else if (!D_801BF968) { - D_801BF8E8 = osGetTime(); - D_801BF968 = true; + } else if (!sIsTimerPaused) { + sTimerPausedOsTime = osGetTime(); + sIsTimerPaused = true; } CLOSE_DISPS(play->state.gfxCtx); } -void Interface_UpdateTimers(PlayState* play) { +void Interface_UpdateBottleTimers(PlayState* play) { MessageContext* msgCtx = &play->msgCtx; s16 i; s16 j; - u64 var3; + u64 osTime; s32 pad[2]; + // Not satisfying any of these conditions will pause the bottle timer if ((play->pauseCtx.state == 0) && (play->pauseCtx.debugEditor == DEBUG_EDITOR_NONE) && (play->gameOverCtx.state == GAMEOVER_INACTIVE) && ((msgCtx->msgMode == 0) || ((msgCtx->currentTextId >= 0x100) && (msgCtx->currentTextId <= 0x200)) || @@ -5659,50 +5690,51 @@ void Interface_UpdateTimers(PlayState* play) { (play->transitionTrigger == TRANS_TRIGGER_OFF) && (play->transitionMode == TRANS_MODE_OFF) && !Play_InCsMode(play)) { - if (D_801BF96C) { - var3 = osGetTime(); + // Account for osTime when the timer is paused + if (sIsBottleTimerPaused) { + osTime = osGetTime(); for (j = BOTTLE_FIRST; j < BOTTLE_MAX; j++) { - if (gSaveContext.bottleStatus[j] == 1) { - gSaveContext.bottleTimer4Value[j] += var3 - D_801BF8F0; + if (gSaveContext.bottleTimerState[j] == BOTTLE_TIMER_STATE_COUNTING) { + gSaveContext.bottleTimerPausedOsTime[j] += osTime - sBottleTimerPausedOsTime; } } - D_801BF96C = false; + sIsBottleTimerPaused = false; } sTimerId = TIMER_ID_NONE; for (i = BOTTLE_FIRST; i < BOTTLE_MAX; i++) { - if (gSaveContext.bottleStatus[i] == 1) { - var3 = osGetTime(); - var3 = (((var3 - ((void)0, gSaveContext.bottleTimer4Value[i]) - - ((void)0, gSaveContext.bottleTimer1Value[i])) / - 10000) * - 64) / - 3000; - if (var3 == 0) { - gSaveContext.bottleTimer3Value[i] = gSaveContext.bottleTimer2Value[i] - var3; - } else if (gSaveContext.bottleTimer2Value[i] >= var3) { - if (gSaveContext.bottleTimer2Value[i] <= var3) { - gSaveContext.bottleTimer3Value[i] = 0; + if (gSaveContext.bottleTimerState[i] == BOTTLE_TIMER_STATE_COUNTING) { + osTime = osGetTime(); + osTime = (((osTime - ((void)0, gSaveContext.bottleTimerPausedOsTime[i]) - + ((void)0, gSaveContext.bottleTimerStartOsTime[i])) / + 10000) * + 64) / + 3000; + if (osTime == 0) { + gSaveContext.bottleTimerCurTime[i] = gSaveContext.bottleTimerCurSubTime[i] - osTime; + } else if (gSaveContext.bottleTimerCurSubTime[i] >= osTime) { + if (gSaveContext.bottleTimerCurSubTime[i] <= osTime) { + gSaveContext.bottleTimerCurTime[i] = 0; } else { - gSaveContext.bottleTimer3Value[i] = gSaveContext.bottleTimer2Value[i] - var3; + gSaveContext.bottleTimerCurTime[i] = gSaveContext.bottleTimerCurSubTime[i] - osTime; } } else { - gSaveContext.bottleTimer3Value[i] = 0; + gSaveContext.bottleTimerCurTime[i] = 0; if (gSaveContext.save.inventory.items[i + SLOT_BOTTLE_1] == ITEM_HOT_SPRING_WATER) { Inventory_UpdateItem(play, i + SLOT_BOTTLE_1, ITEM_SPRING_WATER); Message_StartTextbox(play, 0xFA, NULL); } - gSaveContext.bottleStatus[i] = 0; + gSaveContext.bottleTimerState[i] = BOTTLE_TIMER_STATE_OFF; } } } - } else if (!D_801BF96C) { - D_801BF8F0 = osGetTime(); - D_801BF96C = true; + } else if (!sIsBottleTimerPaused) { + sBottleTimerPausedOsTime = osGetTime(); + sIsBottleTimerPaused = true; } } @@ -6206,7 +6238,7 @@ void Interface_Draw(PlayState* play) { D_801BF884 = 3; Message_StartTextbox(play, 0xF8, NULL); Interface_SetHudVisibility(HUD_VISIBILITY_OFF); - player->stateFlags1 |= 0x200; + player->stateFlags1 |= PLAYER_STATE1_200; } gDPPipeSync(OVERLAY_DISP++); @@ -6419,15 +6451,16 @@ void Interface_Update(PlayState* play) { } LifeMeter_UpdateSizeAndBeep(play); - D_801BF8DC = func_801242DC(play); + sEnvTimerType = Player_GetEnvTimerType(play); - if (D_801BF8DC == 1) { + if (sEnvTimerType == PLAYER_ENV_TIMER_HOTROOM) { if (GET_CUR_EQUIP_VALUE(EQUIP_TYPE_TUNIC) == EQUIP_VALUE_TUNIC_GORON) { - D_801BF8DC = 0; + sEnvTimerType = PLAYER_ENV_TIMER_NONE; } - } else if ((func_801242DC(play) >= 2) && (func_801242DC(play) < 5)) { + } else if ((Player_GetEnvTimerType(play) >= PLAYER_ENV_TIMER_UNDERWATER_FLOOR) && + (Player_GetEnvTimerType(play) <= PLAYER_ENV_TIMER_UNDERWATER_FREE)) { if (GET_CUR_EQUIP_VALUE(EQUIP_TYPE_TUNIC) == EQUIP_VALUE_TUNIC_ZORA) { - D_801BF8DC = 0; + sEnvTimerType = PLAYER_ENV_TIMER_NONE; } } @@ -6581,7 +6614,7 @@ void Interface_Update(PlayState* play) { } // Update Magic - if (!(player->stateFlags1 & 0x200)) { + if (!(player->stateFlags1 & PLAYER_STATE1_200)) { if (XREG(4) == 1) { // Upgrade to double magic if (!gSaveContext.save.playerData.isMagicAcquired) { @@ -6615,24 +6648,24 @@ void Interface_Update(PlayState* play) { Magic_UpdateAddRequest(); } - if (gSaveContext.timerState[TIMER_ID_5] == TIMER_STATE_OFF) { - if ((D_801BF8DC == 1) || (D_801BF8DC == 4)) { + // Update Env Timer + if (gSaveContext.timerState[TIMER_ID_ENV] == TIMER_STATE_OFF) { + if ((sEnvTimerType == PLAYER_ENV_TIMER_HOTROOM) || (sEnvTimerType == PLAYER_ENV_TIMER_UNDERWATER_FREE)) { if (CUR_FORM != PLAYER_FORM_ZORA) { if (play->gameOverCtx.state == GAMEOVER_INACTIVE) { if ((gSaveContext.save.playerData.health >> 1) != 0) { - gSaveContext.timerState[TIMER_ID_5] = TIMER_STATE_8; - gSaveContext.timerX[TIMER_ID_5] = 115; - gSaveContext.timerY[TIMER_ID_5] = 80; - D_801BF8E0 = 1; - gSaveContext.timersNoTimeLimit[TIMER_ID_5] = false; + gSaveContext.timerState[TIMER_ID_ENV] = TIMER_STATE_ENV_START; + gSaveContext.timerX[TIMER_ID_ENV] = 115; + gSaveContext.timerY[TIMER_ID_ENV] = 80; + sEnvTimerActive = true; + gSaveContext.timerDirection[TIMER_ID_ENV] = TIMER_COUNT_DOWN; } } } } - } else { - if (((D_801BF8DC == 0) || (D_801BF8DC == 3)) && (gSaveContext.timerState[TIMER_ID_5] <= TIMER_STATE_4)) { - gSaveContext.timerState[TIMER_ID_5] = TIMER_STATE_OFF; - } + } else if (((sEnvTimerType == PLAYER_ENV_TIMER_NONE) || (sEnvTimerType == PLAYER_ENV_TIMER_SWIMMING)) && + (gSaveContext.timerState[TIMER_ID_ENV] <= TIMER_STATE_4)) { + gSaveContext.timerState[TIMER_ID_ENV] = TIMER_STATE_OFF; } // Update Minigame @@ -6706,7 +6739,7 @@ void Interface_Update(PlayState* play) { } } - Interface_UpdateTimers(play); + Interface_UpdateBottleTimers(play); // Update Grandma's Story if (interfaceCtx->unk_31A != 0) { @@ -6745,7 +6778,7 @@ void Interface_Update(PlayState* play) { void Interface_Destroy(void) { Map_Destroy(); - func_80174F9C(Interface_TimerCallback, NULL); + func_80174F9C(Interface_PostmanTimerCallback, NULL); } void Interface_Init(PlayState* play) { @@ -6797,7 +6830,7 @@ void Interface_Init(PlayState* play) { } if (((gSaveContext.timerState[TIMER_ID_4] == TIMER_STATE_4) || - (gSaveContext.timerState[TIMER_ID_6] == TIMER_STATE_4)) && + (gSaveContext.timerState[TIMER_ID_GORON_RACE_UNUSED] == TIMER_STATE_4)) && ((gSaveContext.respawnFlag == -1) || (gSaveContext.respawnFlag == 1)) && (gSaveContext.timerState[TIMER_ID_4] == TIMER_STATE_4)) { gSaveContext.timerState[TIMER_ID_4] = TIMER_STATE_1; @@ -6819,13 +6852,13 @@ void Interface_Init(PlayState* play) { } gSaveContext.timerState[TIMER_ID_1] = TIMER_STATE_OFF; - gSaveContext.eventTimer1Value[TIMER_ID_1] = 0; - gSaveContext.eventTimer2Value[TIMER_ID_1] = 0; - gSaveContext.funcTimer1Value[TIMER_ID_1] = 0; - gSaveContext.funcTimer2Value[TIMER_ID_1] = 0; - gSaveContext.funcTimer3Value[TIMER_ID_1] = 0; + gSaveContext.timerCurTime[TIMER_ID_1] = SECONDS_TO_TIMER(0); + gSaveContext.timerCurSubTime[TIMER_ID_1] = SECONDS_TO_TIMER(0); + gSaveContext.timerStartOsTime[TIMER_ID_1] = 0; + gSaveContext.timerEndOsTime[TIMER_ID_1] = 0; + gSaveContext.timerPausedOsTime[TIMER_ID_1] = 0; - for (i = 0; i < 7; i++) { + for (i = 0; i < TIMER_ID_MAX; i++) { if (gSaveContext.timerState[i] == TIMER_STATE_7) { gSaveContext.timerState[i] = TIMER_STATE_OFF; } diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index 14f0d2fd6..24c7ce5d6 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -860,39 +860,40 @@ s32 func_80124278(Actor* actor, s32 actionParam) { } s32 func_801242B4(Player* player) { - return (player->stateFlags1 & PLAYER_STATE1_8000000) && player->currentBoots < PLAYER_BOOTS_ZORA_UNDERWATER; + return (player->stateFlags1 & PLAYER_STATE1_8000000) && (player->currentBoots < PLAYER_BOOTS_ZORA_UNDERWATER); } -s32 func_801242DC(PlayState* play) { +s32 Player_GetEnvTimerType(PlayState* play) { Player* player = GET_PLAYER(play); TextTriggerEntry* triggerEntry; - s32 envIndex; + s32 envTimerType; if (play->roomCtx.currRoom.unk2 == 3) { // Room is hot - envIndex = 0; + envTimerType = PLAYER_ENV_TIMER_HOTROOM - 1; } else if ((player->transformation != PLAYER_FORM_ZORA) && (player->unk_AD8 > 80)) { - envIndex = 3; + envTimerType = PLAYER_ENV_TIMER_UNDERWATER_FREE - 1; } else if (player->stateFlags1 & PLAYER_STATE1_8000000) { if ((player->transformation == PLAYER_FORM_ZORA) && (player->currentBoots >= PLAYER_BOOTS_ZORA_UNDERWATER) && (player->actor.bgCheckFlags & 1)) { - envIndex = 1; + envTimerType = PLAYER_ENV_TIMER_UNDERWATER_FLOOR - 1; } else { - envIndex = 2; + envTimerType = PLAYER_ENV_TIMER_SWIMMING - 1; } } else { - return 0; + return PLAYER_ENV_TIMER_NONE; } // Trigger general textboxes under certain conditions, like "It's so hot in here!". Unused in MM - triggerEntry = &sEnvironmentTextTriggers[envIndex]; + triggerEntry = &sEnvironmentTextTriggers[envTimerType]; if (!Player_InCsMode(play)) { - if ((triggerEntry->flag) && !(gSaveContext.textTriggerFlags & triggerEntry->flag) && (envIndex == 0)) { + if ((triggerEntry->flag) && !(gSaveContext.textTriggerFlags & triggerEntry->flag) && + (envTimerType == (PLAYER_ENV_TIMER_HOTROOM - 1))) { Message_StartTextbox(play, triggerEntry->textId, NULL); gSaveContext.textTriggerFlags |= triggerEntry->flag; } } - return envIndex + 1; + return envTimerType + 1; } #pragma GLOBAL_ASM("asm/non_matchings/code/z_player_lib/func_80124420.s") diff --git a/src/code/z_sram_NES.c b/src/code/z_sram_NES.c index 787a654fe..09c20d507 100644 --- a/src/code/z_sram_NES.c +++ b/src/code/z_sram_NES.c @@ -219,13 +219,13 @@ void Sram_ActivateOwl(u8 owlId) { void Sram_ClearHighscores(void) { gSaveContext.save.unk_EE8 = (gSaveContext.save.unk_EE8 & 0xFFFF) | 0x130000; gSaveContext.save.unk_EE8 = (gSaveContext.save.unk_EE8 & 0xFFFF0000) | 0xA; - gSaveContext.save.horseBackBalloonHighScore = 6000; // 60 seconds + gSaveContext.save.horseBackBalloonHighScore = SECONDS_TO_TIMER(60); SET_TOWN_SHOOTING_GALLERY_HIGH_SCORE(39); SET_SWAMP_SHOOTING_GALLERY_HIGH_SCORE(10); - gSaveContext.save.dekuPlaygroundHighScores[0] = 7500; // 75 seconds - gSaveContext.save.dekuPlaygroundHighScores[1] = 7500; // 75 seconds - gSaveContext.save.dekuPlaygroundHighScores[2] = 7600; // 76 seconds + gSaveContext.save.dekuPlaygroundHighScores[0] = SECONDS_TO_TIMER(75); + gSaveContext.save.dekuPlaygroundHighScores[1] = SECONDS_TO_TIMER(75); + gSaveContext.save.dekuPlaygroundHighScores[2] = SECONDS_TO_TIMER(76); } /** @@ -896,11 +896,11 @@ void func_80144A94(SramContext* sramCtx) { for (i = 0; i < ARRAY_COUNT(gSaveContext.timerState); i++) { gSaveContext.timerState[i] = TIMER_STATE_OFF; - gSaveContext.eventTimer1Value[i] = 0; - gSaveContext.eventTimer2Value[i] = 0; - gSaveContext.funcTimer1Value[i] = 0; - gSaveContext.funcTimer2Value[i] = 0; - gSaveContext.funcTimer3Value[i] = 0; + gSaveContext.timerCurTime[i] = SECONDS_TO_TIMER(0); + gSaveContext.timerCurSubTime[i] = SECONDS_TO_TIMER(0); + gSaveContext.timerStartOsTime[i] = 0; + gSaveContext.timerEndOsTime[i] = 0; + gSaveContext.timerPausedOsTime[i] = 0; } D_801BDAA0 = 1; @@ -971,11 +971,11 @@ void Sram_OpenSave(FileChooseContext* fileChooseCtx, SramContext* sramCtx) { for (i = 0; i < ARRAY_COUNT(gSaveContext.timerState); i++) { gSaveContext.timerState[i] = TIMER_STATE_OFF; - gSaveContext.eventTimer1Value[i] = 0; - gSaveContext.eventTimer2Value[i] = 0; - gSaveContext.funcTimer1Value[i] = 0; - gSaveContext.funcTimer2Value[i] = 0; - gSaveContext.funcTimer3Value[i] = 0; + gSaveContext.timerCurTime[i] = SECONDS_TO_TIMER(0); + gSaveContext.timerCurSubTime[i] = SECONDS_TO_TIMER(0); + gSaveContext.timerStartOsTime[i] = 0; + gSaveContext.timerEndOsTime[i] = 0; + gSaveContext.timerPausedOsTime[i] = 0; } if (gSaveContext.save.isFirstCycle) { diff --git a/src/overlays/actors/ovl_Boss_03/z_boss_03.c b/src/overlays/actors/ovl_Boss_03/z_boss_03.c index 75378de78..43cce6afa 100644 --- a/src/overlays/actors/ovl_Boss_03/z_boss_03.c +++ b/src/overlays/actors/ovl_Boss_03/z_boss_03.c @@ -53,6 +53,7 @@ * - Seaweed */ +#include "prevent_bss_reordering.h" #include "z_boss_03.h" #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" #include "overlays/actors/ovl_En_Water_Effect/z_en_water_effect.h" diff --git a/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c b/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c index 256e0f33a..f2d114586 100644 --- a/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c +++ b/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c @@ -1045,11 +1045,11 @@ void DmStk_Init(Actor* thisx, PlayState* play) { if (gSaveContext.save.entrance == ENTRANCE(CLOCK_TOWER_ROOFTOP, 0)) { if (gSaveContext.sceneSetupIndex == 0) { - if (gSaveContext.timerState[TIMER_ID_3] == TIMER_STATE_OFF) { + if (gSaveContext.timerState[TIMER_ID_FINAL_HOURS] == TIMER_STATE_OFF) { // Starts a 5 minute (300 second) timer until the moon falls. - func_8010E9F0(TIMER_ID_3, 300); - XREG(80) = 200; - XREG(81) = 115; + Interface_StartTimer(TIMER_ID_FINAL_HOURS, 300); + R_FINAL_HOURS_TIMER_Y = 200; + R_FINAL_HOURS_TIMER_X = 115; } if (gSaveContext.save.inventory.items[SLOT_OCARINA] == ITEM_NONE) { @@ -1062,12 +1062,12 @@ void DmStk_Init(Actor* thisx, PlayState* play) { } else if (gSaveContext.sceneSetupIndex == 3) { this->animIndex = SK_ANIM_FLOATING_ARMS_CROSSED; - if (gSaveContext.timerState[TIMER_ID_3] == TIMER_STATE_OFF) { + if (gSaveContext.timerState[TIMER_ID_FINAL_HOURS] == TIMER_STATE_OFF) { // This code is called when the Giants fail to stop the moon. // Starts a 1 minute (60 second) timer until the moon falls. - func_8010E9F0(TIMER_ID_3, 60); - XREG(80) = 200; - XREG(81) = 115; + Interface_StartTimer(TIMER_ID_FINAL_HOURS, 60); + R_FINAL_HOURS_TIMER_Y = 200; + R_FINAL_HOURS_TIMER_X = 115; } this->actor.world.pos.y = 120.0f; diff --git a/src/overlays/actors/ovl_En_Dno/z_en_dno.c b/src/overlays/actors/ovl_En_Dno/z_en_dno.c index 3c872c0e8..69f5082ae 100644 --- a/src/overlays/actors/ovl_En_Dno/z_en_dno.c +++ b/src/overlays/actors/ovl_En_Dno/z_en_dno.c @@ -216,7 +216,7 @@ void EnDno_Init(Actor* thisx, PlayState* play) { } else { SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, 14, &this->unk_32C); thisx->room = -1; - gSaveContext.timerState[TIMER_ID_1] = TIMER_STATE_5; + gSaveContext.timerState[TIMER_ID_1] = TIMER_STATE_STOP; this->lightNode = LightContext_InsertLight(play, &play->lightCtx, &this->lightInfo); this->unk_3B0 |= 1; this->actionFunc = func_80A72438; @@ -817,7 +817,7 @@ void func_80A73244(EnDno* this, PlayState* play) { this->unk_328 = 2; this->actor.speedXZ = 0.0f; Flags_UnsetSwitch(play, ENDNO_GET_3F80(&this->actor)); - gSaveContext.timerState[TIMER_ID_1] = TIMER_STATE_5; + gSaveContext.timerState[TIMER_ID_1] = TIMER_STATE_STOP; this->unk_44E = 0; this->actionFunc = func_80A732C8; } diff --git a/src/overlays/actors/ovl_En_Fu/z_en_fu.c b/src/overlays/actors/ovl_En_Fu/z_en_fu.c index 1b5f8e085..92126dfdf 100644 --- a/src/overlays/actors/ovl_En_Fu/z_en_fu.c +++ b/src/overlays/actors/ovl_En_Fu/z_en_fu.c @@ -401,7 +401,7 @@ void func_80962340(EnFu* this, PlayState* play) { Message_StartTextbox(play, 0x287E, &this->actor); this->unk_552 = 0x287E; } - } else if ((gSaveContext.eventTimer1Value[TIMER_ID_4] == 0) && (this->unk_552 != 0x2888)) { + } else if ((gSaveContext.timerCurTime[TIMER_ID_4] == SECONDS_TO_TIMER(0)) && (this->unk_552 != 0x2888)) { Message_StartTextbox(play, 0x2886, &this->actor); this->unk_552 = 0x2886; } else { @@ -644,7 +644,7 @@ void func_80962A10(EnFu* this, PlayState* play) { play_sound(NA_SE_SY_FOUND); player->stateFlags1 &= ~0x20; - func_8010E9F0(TIMER_ID_4, 60); + Interface_StartTimer(TIMER_ID_4, 60); if (this->unk_546 == 1) { func_809616E0(this, play); } else { @@ -682,7 +682,7 @@ void func_80962BCC(EnFu* this, PlayState* play) { play_sound(NA_SE_SY_FOUND); player->stateFlags1 &= ~0x20; player->stateFlags3 |= 0x400000; - func_8010E9F0(TIMER_ID_4, 60); + Interface_StartTimer(TIMER_ID_4, 60); if (this->unk_546 == 1) { func_809616E0(this, play); @@ -713,7 +713,7 @@ void func_80962D60(EnFu* this, PlayState* play) { play_sound(NA_SE_SY_FOUND); player->stateFlags1 &= ~0x20; player->stateFlags3 |= 0x400000; - func_8010E9F0(TIMER_ID_4, 60); + Interface_StartTimer(TIMER_ID_4, 60); if (this->unk_546 == 1) { func_809616E0(this, play); @@ -761,11 +761,11 @@ void func_80962F4C(EnFu* this, PlayState* play) { break; } - if (gSaveContext.eventTimer1Value[TIMER_ID_4] < 2000) { + if (gSaveContext.timerCurTime[TIMER_ID_4] < SECONDS_TO_TIMER(20)) { s16 val = D_80964B00[this->unk_542] + 200; Math_SmoothStepToS(&fuKaiten->rotationSpeed, val, 10, 5, 5); - } else if (gSaveContext.eventTimer1Value[TIMER_ID_4] < 4000) { + } else if (gSaveContext.timerCurTime[TIMER_ID_4] < SECONDS_TO_TIMER(40)) { s16 val = D_80964B00[this->unk_542] + 100; Math_SmoothStepToS(&fuKaiten->rotationSpeed, val, 10, 5, 5); @@ -777,12 +777,12 @@ void func_80962F4C(EnFu* this, PlayState* play) { if ((!DynaPolyActor_IsInRidingRotatingState((DynaPolyActor*)this->actor.child) && (player->actor.bgCheckFlags & 1)) || - (gSaveContext.eventTimer1Value[TIMER_ID_4] < 1) || (this->unk_548 == this->unk_54C)) { + (gSaveContext.timerCurTime[TIMER_ID_4] <= SECONDS_TO_TIMER(0)) || (this->unk_548 == this->unk_54C)) { player->stateFlags3 &= ~0x400000; func_80961E88(play); player->stateFlags1 |= 0x20; if (this->unk_548 < this->unk_54C) { - if (gSaveContext.eventTimer1Value[TIMER_ID_4] == 0) { + if (gSaveContext.timerCurTime[TIMER_ID_4] == SECONDS_TO_TIMER(0)) { Message_StartTextbox(play, 0x2885, &this->actor); this->unk_552 = 0x2885; } else { @@ -790,15 +790,15 @@ void func_80962F4C(EnFu* this, PlayState* play) { this->unk_552 = 0x2888; } func_801A2C20(); - gSaveContext.eventTimer1Value[TIMER_ID_4] = 0; - gSaveContext.timerState[TIMER_ID_4] = TIMER_STATE_5; + gSaveContext.timerCurTime[TIMER_ID_4] = SECONDS_TO_TIMER(0); + gSaveContext.timerState[TIMER_ID_4] = TIMER_STATE_STOP; this->unk_548 = 0; func_809632D0(this); } else { this->unk_548 = 0; func_801A2C20(); - gSaveContext.eventTimer1Value[TIMER_ID_4] = 0; - gSaveContext.timerState[TIMER_ID_4] = TIMER_STATE_5; + gSaveContext.timerCurTime[TIMER_ID_4] = SECONDS_TO_TIMER(0); + gSaveContext.timerState[TIMER_ID_4] = TIMER_STATE_STOP; func_801A3098(NA_BGM_GET_ITEM | 0x900); Interface_SetPerfectMinigame(play, 1); this->unk_54A = 3; diff --git a/src/overlays/actors/ovl_En_Gb2/z_en_gb2.c b/src/overlays/actors/ovl_En_Gb2/z_en_gb2.c index a945011a8..8c9956ca9 100644 --- a/src/overlays/actors/ovl_En_Gb2/z_en_gb2.c +++ b/src/overlays/actors/ovl_En_Gb2/z_en_gb2.c @@ -459,7 +459,7 @@ void func_80B10240(EnGb2* this, PlayState* play) { D_80B119B0[this->unk_280].unk_04.y, D_80B119B0[this->unk_280].unk_04.z, 0, 0, 0, this->unk_27E); if (this->unk_280 == 0) { - func_8010E9F0(TIMER_ID_1, 180); + Interface_StartTimer(TIMER_ID_1, 180); } this->actionFunc = func_80B10344; } else { @@ -487,7 +487,7 @@ void func_80B10344(EnGb2* this, PlayState* play) { if (this->unk_26C & 0x200) { if (this->unk_280 == 3) { this->unk_26C &= ~0x200; - gSaveContext.timerState[TIMER_ID_1] = TIMER_STATE_5; + gSaveContext.timerState[TIMER_ID_1] = TIMER_STATE_STOP; func_800FE498(); gSaveContext.eventInf[4] |= 0x40; func_80B0FE7C(play); @@ -506,7 +506,7 @@ void func_80B10344(EnGb2* this, PlayState* play) { } if (gSaveContext.save.playerData.health < 49) { - gSaveContext.timerState[TIMER_ID_1] = TIMER_STATE_5; + gSaveContext.timerState[TIMER_ID_1] = TIMER_STATE_STOP; gSaveContext.eventInf[4] |= 0x40; gSaveContext.eventInf[4] |= 0x20; @@ -519,8 +519,8 @@ void func_80B10344(EnGb2* this, PlayState* play) { } func_80B0FE7C(play); - } else if (gSaveContext.eventTimer1Value[TIMER_ID_1] == 0) { - gSaveContext.timerState[TIMER_ID_1] = TIMER_STATE_5; + } else if (gSaveContext.timerCurTime[TIMER_ID_1] == SECONDS_TO_TIMER(0)) { + gSaveContext.timerState[TIMER_ID_1] = TIMER_STATE_STOP; gSaveContext.eventInf[4] |= 0x40; gSaveContext.eventInf[4] |= 0x10; diff --git a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c index de5a68613..129595b28 100644 --- a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c +++ b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c @@ -121,7 +121,7 @@ s32 func_808F8CCC(EnHorseGameCheck* this, PlayState* play2) { return false; } - func_8010E9F0(TIMER_ID_4, 0); + Interface_StartTimer(TIMER_ID_4, 0); play->interfaceCtx.minigameState = 1; this->horse1 = (EnHorse*)Actor_Spawn(&play->actorCtx, play, ACTOR_EN_HORSE, -1149.0f, -106.0f, 470.0f, 0, 0x7FFF, 0, @@ -247,7 +247,7 @@ s32 func_808F8FAC(EnHorseGameCheck* this, PlayState* play) { return true; } - if (gSaveContext.eventTimer1Value[TIMER_ID_4] >= 0x4650) { + if (gSaveContext.timerCurTime[TIMER_ID_4] >= SECONDS_TO_TIMER(180)) { Audio_QueueSeqCmd(0x8041); play_sound(NA_SE_SY_START_SHOT); this->unk_164 |= 0x40000; diff --git a/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c b/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c index 206e9e5e5..9eef37c08 100644 --- a/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c +++ b/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c @@ -155,7 +155,7 @@ void func_80C13BB8(EnJgameTsn* this, PlayState* play) { if (Actor_ProcessTalkRequest(&this->actor, &play->state)) { if (this->actor.flags & ACTOR_FLAG_10000) { this->actor.flags &= ~ACTOR_FLAG_10000; - if (gSaveContext.eventTimer1Value[TIMER_ID_4] > 0) { + if (gSaveContext.timerCurTime[TIMER_ID_4] > SECONDS_TO_TIMER(0)) { Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, 1); Message_StartTextbox(play, 0x10A2, &this->actor); this->unk_300 = 0x10A2; @@ -287,7 +287,7 @@ void func_80C1410C(EnJgameTsn* this, PlayState* play) { play->interfaceCtx.minigameState = 1; Interface_InitMinigame(play); gSaveContext.save.weekEventReg[90] |= 0x20; - func_8010E9F0(TIMER_ID_4, 120); + Interface_StartTimer(TIMER_ID_4, 120); this->actionFunc = func_80C1418C; } @@ -352,7 +352,7 @@ void func_80C14230(EnJgameTsn* this, PlayState* play) { func_80C14030(this); } - if (gSaveContext.eventTimer1Value[TIMER_ID_4] == 0) { + if (gSaveContext.timerCurTime[TIMER_ID_4] == SECONDS_TO_TIMER(0)) { Message_StartTextbox(play, 0x10A1, &this->actor); this->unk_300 = 0x10A1; player->stateFlags1 |= 0x20; @@ -479,7 +479,7 @@ void func_80C147B4(EnJgameTsn* this, PlayState* play) { case 0x10A1: func_801477B4(play); gSaveContext.minigameState = 3; - gSaveContext.timerState[TIMER_ID_4] = TIMER_STATE_5; + gSaveContext.timerState[TIMER_ID_4] = TIMER_STATE_STOP; gSaveContext.save.weekEventReg[90] &= (u8)~0x20; func_80C144E4(this); break; diff --git a/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c b/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c index 17fd7d32d..abb37120b 100644 --- a/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c +++ b/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c @@ -674,7 +674,7 @@ void EnMa4_HorsebackGameCheckPlayerInteractions(EnMa4* this, PlayState* play) { // "You're feeling confident" Message_StartTextbox(play, 0x336E, &this->actor); this->actionFunc = EnMa4_HorsebackGameTalking; - } else if ((gSaveContext.eventTimer1Value[TIMER_ID_4] < 115 * 100)) { // timer < 115 seconds + } else if (gSaveContext.timerCurTime[TIMER_ID_4] < SECONDS_TO_TIMER(115)) { func_800B8614(&this->actor, play, 100.0f); } } @@ -689,7 +689,7 @@ void EnMa4_InitHorsebackGame(EnMa4* this, PlayState* play) { Player* player = GET_PLAYER(play); play->interfaceCtx.minigameState = 1; - func_8010E9F0(TIMER_ID_4, 0); + Interface_StartTimer(TIMER_ID_4, 0); gSaveContext.save.weekEventReg[8] |= 1; Interface_InitMinigame(play); player->stateFlags1 |= 0x20; @@ -717,8 +717,7 @@ void EnMa4_HorsebackGameWait(EnMa4* this, PlayState* play) { play->interfaceCtx.unk_25C = 1; } - if ((gSaveContext.eventTimer1Value[TIMER_ID_4] >= 2 * 60 * 100) // timer >= 2 minutes - || (this->poppedBalloonCounter == 10)) { + if ((gSaveContext.timerCurTime[TIMER_ID_4] >= SECONDS_TO_TIMER(120)) || (this->poppedBalloonCounter == 10)) { gSaveContext.timerState[TIMER_ID_4] = TIMER_STATE_6; EnMa4_SetupHorsebackGameEnd(this, play); D_80AC0258 = 0; @@ -898,13 +897,13 @@ void EnMa4_StartDialogue(EnMa4* this, PlayState* play) { gSaveContext.save.weekEventReg[21] |= 0x40; } } else if (this->state == MA4_STATE_AFTERHORSEBACKGAME) { - if (gSaveContext.eventTimer1Value[TIMER_ID_4] >= 2 * 60 * 100) { + if (gSaveContext.timerCurTime[TIMER_ID_4] >= SECONDS_TO_TIMER(120)) { // "Too bad Grasshopper" EnMa4_SetFaceExpression(this, 0, 0); Message_StartTextbox(play, 0x336D, &this->actor); this->textId = 0x336D; } else { - time = gSaveContext.eventTimer1Value[TIMER_ID_4]; + time = gSaveContext.timerCurTime[TIMER_ID_4]; if ((s32)time < (s32)gSaveContext.save.horseBackBalloonHighScore) { // [Score] New record! gSaveContext.save.horseBackBalloonHighScore = time; @@ -943,12 +942,12 @@ void EnMa4_StartDialogue(EnMa4* this, PlayState* play) { Message_StartTextbox(play, 0x3354, &this->actor); this->textId = 0x3354; } else if (this->state == MA4_STATE_AFTERHORSEBACKGAME) { - if (gSaveContext.eventTimer1Value[TIMER_ID_4] >= 2 * 60 * 100) { + if (gSaveContext.timerCurTime[TIMER_ID_4] >= SECONDS_TO_TIMER(120)) { // "Try again?" Message_StartTextbox(play, 0x3356, &this->actor); this->textId = 0x3356; } else { - time = gSaveContext.eventTimer1Value[TIMER_ID_4]; + time = gSaveContext.timerCurTime[TIMER_ID_4]; if ((s32)time < (s32)gSaveContext.save.horseBackBalloonHighScore) { gSaveContext.save.horseBackBalloonHighScore = time; EnMa4_SetFaceExpression(this, 0, 3); @@ -970,12 +969,12 @@ void EnMa4_StartDialogue(EnMa4* this, PlayState* play) { Message_StartTextbox(play, 0x3358, &this->actor); this->textId = 0x3358; } else if (this->state == MA4_STATE_AFTERHORSEBACKGAME) { - if (gSaveContext.eventTimer1Value[TIMER_ID_4] >= 2 * 60 * 100) { + if (gSaveContext.timerCurTime[TIMER_ID_4] >= SECONDS_TO_TIMER(120)) { // "Try again?" Message_StartTextbox(play, 0x3356, &this->actor); this->textId = 0x3356; } else { - time = gSaveContext.eventTimer1Value[TIMER_ID_4]; + time = gSaveContext.timerCurTime[TIMER_ID_4]; if ((s32)time < (s32)gSaveContext.save.horseBackBalloonHighScore) { // New record gSaveContext.save.horseBackBalloonHighScore = time; diff --git a/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c b/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c index 994adef6f..4a89bbb00 100644 --- a/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c +++ b/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c @@ -249,14 +249,14 @@ void func_80A6F5E4(EnMm3* this, PlayState* play) { break; case 0x2791: - if (gSaveContext.eventTimer1Value[TIMER_ID_0] == 1000) { + if (gSaveContext.timerCurTime[TIMER_ID_POSTMAN] == SECONDS_TO_TIMER(10)) { Message_StartTextbox(play, 0x2792, &this->actor); this->unk_2B4 = 0x2792; - } else if ((gSaveContext.eventTimer1Value[TIMER_ID_0] >= 1500)) { + } else if ((gSaveContext.timerCurTime[TIMER_ID_POSTMAN] >= SECONDS_TO_TIMER(15))) { Message_StartTextbox(play, 0x2797, &this->actor); this->unk_2B4 = 0x2797; - } else if ((gSaveContext.eventTimer1Value[TIMER_ID_0] <= 1050) && - (gSaveContext.eventTimer1Value[TIMER_ID_0] >= 950)) { + } else if ((gSaveContext.timerCurTime[TIMER_ID_POSTMAN] <= SECONDS_TO_TIMER_PRECISE(10, 50)) && + (gSaveContext.timerCurTime[TIMER_ID_POSTMAN] >= SECONDS_TO_TIMER_PRECISE(9, 50))) { Message_StartTextbox(play, 0x2795, &this->actor); this->unk_2B4 = 0x2795; } else { @@ -302,7 +302,7 @@ void func_80A6F5E4(EnMm3* this, PlayState* play) { } else if ((this->unk_2AC > 0) && (this->unk_2B4 == 0x2791)) { this->unk_2AC--; if (this->unk_2AC == 0) { - if (gSaveContext.eventTimer1Value[TIMER_ID_0] == 1000) { + if (gSaveContext.timerCurTime[TIMER_ID_POSTMAN] == SECONDS_TO_TIMER(10)) { func_801A3098(0x922); } else { play_sound(NA_SE_SY_ERROR); @@ -343,9 +343,9 @@ void func_80A6F9DC(EnMm3* this, PlayState* play) { player->stateFlags1 |= 0x20; if (Player_GetMask(play) == PLAYER_MASK_BUNNY) { - func_8010EA9C(0, 2); + Interface_StartPostmanTimer(0, POSTMAN_MINIGAME_BUNNY_HOOD_ON); } else { - func_8010EA9C(0, 0); + Interface_StartPostmanTimer(0, POSTMAN_MINIGAME_BUNNY_HOOD_OFF); } func_801477B4(play); play_sound(NA_SE_SY_START_SHOT); @@ -382,17 +382,19 @@ void func_80A6FBA0(EnMm3* this) { void func_80A6FBFC(EnMm3* this, PlayState* play) { Player* player = GET_PLAYER(play); - if (gSaveContext.timerState[TIMER_ID_0] == TIMER_STATE_16) { + if (gSaveContext.timerState[TIMER_ID_POSTMAN] == TIMER_STATE_POSTMAN_END) { player->stateFlags1 &= ~0x20; this->actor.flags |= ACTOR_FLAG_10000; - if (gSaveContext.eventTimer1Value[TIMER_ID_0] > 1500) { - gSaveContext.eventTimer1Value[TIMER_ID_0] = 1500; - } else if ((((void)0, gSaveContext.eventTimer1Value[TIMER_ID_0]) >= (OSTime)(995 - XREG(16))) && - (((void)0, gSaveContext.eventTimer1Value[TIMER_ID_0]) <= (OSTime)(1005 + XREG(17)))) { - gSaveContext.eventTimer1Value[TIMER_ID_0] = 1000; + if (gSaveContext.timerCurTime[TIMER_ID_POSTMAN] > SECONDS_TO_TIMER(15)) { + gSaveContext.timerCurTime[TIMER_ID_POSTMAN] = SECONDS_TO_TIMER(15); + } else if ((((void)0, gSaveContext.timerCurTime[TIMER_ID_POSTMAN]) >= + (OSTime)(SECONDS_TO_TIMER_PRECISE(10, -5) - XREG(16))) && + (((void)0, gSaveContext.timerCurTime[TIMER_ID_POSTMAN]) <= + (OSTime)(SECONDS_TO_TIMER_PRECISE(10, 5) + XREG(17)))) { + gSaveContext.timerCurTime[TIMER_ID_POSTMAN] = SECONDS_TO_TIMER(10); } - } else if (gSaveContext.eventTimer1Value[TIMER_ID_0] > 1500) { - gSaveContext.timerState[TIMER_ID_0] = TIMER_STATE_15; + } else if (gSaveContext.timerCurTime[TIMER_ID_POSTMAN] > SECONDS_TO_TIMER(15)) { + gSaveContext.timerState[TIMER_ID_POSTMAN] = TIMER_STATE_POSTMAN_STOP; gSaveContext.timerOsTime = osGetTime(); } @@ -402,7 +404,7 @@ void func_80A6FBFC(EnMm3* this, PlayState* play) { Message_StartTextbox(play, 0x2791, &this->actor); this->unk_2B4 = 0x2791; this->unk_2AC = 7; - gSaveContext.timerState[TIMER_ID_0] = TIMER_STATE_OFF; + gSaveContext.timerState[TIMER_ID_POSTMAN] = TIMER_STATE_OFF; this->actor.flags &= ~ACTOR_FLAG_10000; play_sound(NA_SE_SY_START_SHOT); func_80A6F9C8(this); diff --git a/src/overlays/actors/ovl_En_Mm3/z_en_mm3.h b/src/overlays/actors/ovl_En_Mm3/z_en_mm3.h index b6f653935..1cc1946f5 100644 --- a/src/overlays/actors/ovl_En_Mm3/z_en_mm3.h +++ b/src/overlays/actors/ovl_En_Mm3/z_en_mm3.h @@ -7,6 +7,11 @@ struct EnMm3; typedef void (*EnMm3ActionFunc)(struct EnMm3*, PlayState*); +typedef enum { + /* 0 */ POSTMAN_MINIGAME_BUNNY_HOOD_OFF, + /* 2 */ POSTMAN_MINIGAME_BUNNY_HOOD_ON = 2 +} PostmanMinigameBunnyHoodState; + typedef struct EnMm3 { /* 0x000 */ Actor actor; /* 0x144 */ SkelAnime skelAnime; diff --git a/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.c b/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.c index 4db6992f7..d81e74836 100644 --- a/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.c +++ b/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.c @@ -314,7 +314,7 @@ void EnMttag_RaceStart(EnMttag* this, PlayState* play) { gSaveContext.eventInf[1] |= 8; } else { if (DECR(this->timer) == 60) { - func_8010E9F0(TIMER_ID_4, 0); + Interface_StartTimer(TIMER_ID_4, 0); play->interfaceCtx.minigameState = 1; Audio_QueueSeqCmd(NA_BGM_GORON_RACE | 0x8000); play->envCtx.unk_E4 = 0xFE; @@ -504,7 +504,7 @@ void EnMttag_Init(Actor* thisx, PlayState* play) { void EnMttag_Destroy(Actor* thisx, PlayState* play) { EnMttag* this = THIS; if (gSaveContext.timerState[TIMER_ID_4] != TIMER_STATE_6) { - gSaveContext.timerState[TIMER_ID_4] = TIMER_STATE_5; + gSaveContext.timerState[TIMER_ID_4] = TIMER_STATE_STOP; } } diff --git a/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.c b/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.c index cebaafb44..65200e44e 100644 --- a/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.c +++ b/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.c @@ -271,7 +271,8 @@ void func_80A2C2E0(EnSyatekiDekunuts* this, PlayState* play) { void func_80A2C33C(EnSyatekiDekunuts* this, PlayState* play) { EnSyatekiMan* syatekiMan = (EnSyatekiMan*)this->actor.parent; - if ((gSaveContext.eventTimer1Value[TIMER_ID_1] <= 0) || (syatekiMan->shootingGameState != SG_GAME_STATE_RUNNING)) { + if ((gSaveContext.timerCurTime[TIMER_ID_1] <= SECONDS_TO_TIMER(0)) || + (syatekiMan->shootingGameState != SG_GAME_STATE_RUNNING)) { func_80A2C3AC(this); } diff --git a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c index 9b6cc24d3..05471caef 100644 --- a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c +++ b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c @@ -1012,7 +1012,7 @@ void EnSyatekiMan_Swamp_StartGame(EnSyatekiMan* this, PlayState* play) { this->guayHitCounter = 0; this->currentWave = 0; this->perGameVar2.bonusDekuScrubHitCounter = 0; - func_8010E9F0(TIMER_ID_1, 100); + Interface_StartTimer(TIMER_ID_1, 100); this->actor.draw = NULL; this->actionFunc = EnSyatekiMan_Swamp_RunGame; } @@ -1061,9 +1061,9 @@ void EnSyatekiMan_Swamp_RunGame(EnSyatekiMan* this, PlayState* play) { this->perGameVar1.guaySpawnTimer++; - if (gSaveContext.eventTimer1Value[TIMER_ID_1] == 0) { - gSaveContext.eventTimer1Value[TIMER_ID_1] = 0; - gSaveContext.timerState[TIMER_ID_1] = TIMER_STATE_5; + if (gSaveContext.timerCurTime[TIMER_ID_1] == SECONDS_TO_TIMER(0)) { + gSaveContext.timerCurTime[TIMER_ID_1] = SECONDS_TO_TIMER(0); + gSaveContext.timerState[TIMER_ID_1] = TIMER_STATE_STOP; this->actor.draw = EnSyatekiMan_Draw; this->flagsIndex = 0; this->currentWave = 0; @@ -1085,7 +1085,7 @@ void EnSyatekiMan_Swamp_RunGame(EnSyatekiMan* this, PlayState* play) { gSaveContext.timerState[TIMER_ID_1] = TIMER_STATE_6; this->actionFunc = EnSyatekiMan_Swamp_AddBonusPoints; } else { - gSaveContext.timerState[TIMER_ID_1] = TIMER_STATE_5; + gSaveContext.timerState[TIMER_ID_1] = TIMER_STATE_STOP; this->actionFunc = EnSyatekiMan_Swamp_EndGame; } } @@ -1148,15 +1148,15 @@ void EnSyatekiMan_Swamp_AddBonusPoints(EnSyatekiMan* this, PlayState* play) { player->stateFlags1 |= 0x20; if (!play->interfaceCtx.isMinigamePerfect) { - if (gSaveContext.eventTimer1Value[TIMER_ID_1] == 0) { - gSaveContext.eventTimer1Value[TIMER_ID_1] = 0; - gSaveContext.timerState[TIMER_ID_1] = TIMER_STATE_5; + if (gSaveContext.timerCurTime[TIMER_ID_1] == SECONDS_TO_TIMER(0)) { + gSaveContext.timerCurTime[TIMER_ID_1] = SECONDS_TO_TIMER(0); + gSaveContext.timerState[TIMER_ID_1] = TIMER_STATE_STOP; this->flagsIndex = 0; this->currentWave = 0; this->actionFunc = EnSyatekiMan_Swamp_EndGame; sBonusTimer = 0; } else if (sBonusTimer > 10) { - gSaveContext.funcTimer2Value[TIMER_ID_1] += 100; + gSaveContext.timerEndOsTime[TIMER_ID_1] += 100; play->interfaceCtx.unk_25C += 10; this->score += 10; Actor_PlaySfxAtPos(&this->actor, NA_SE_SY_TRE_BOX_APPEAR); @@ -1220,7 +1220,7 @@ void EnSyatekiMan_Town_StartGame(EnSyatekiMan* this, PlayState* play) { this->perGameVar1.octorokState = SG_OCTO_STATE_INITIAL; this->perGameVar2.octorokHitType = SG_OCTO_HIT_TYPE_NONE; sGameStartTimer = 30; - func_8010E9F0(TIMER_ID_1, 75); + Interface_StartTimer(TIMER_ID_1, 75); this->actor.draw = NULL; this->actionFunc = EnSyatekiMan_Town_RunGame; } @@ -1292,7 +1292,7 @@ static const s32 sOctorokFlagsPerWave[] = { void EnSyatekiMan_Town_RunGame(EnSyatekiMan* this, PlayState* play) { static s32 sModFromLosingTime = 0; Player* player = GET_PLAYER(play); - s32 timer = (((void)0, gSaveContext.eventTimer1Value[TIMER_ID_1]) * 0.1f) + 1.0f; // unit is tenths of a second + s32 timer = (((void)0, gSaveContext.timerCurTime[TIMER_ID_1]) * 0.1f) + 1.0f; // unit is tenths of a second if (timer <= 750) { s32 waveTimer; // unit is hundredths of a second @@ -1302,9 +1302,10 @@ void EnSyatekiMan_Town_RunGame(EnSyatekiMan* this, PlayState* play) { // begin hiding. This code will ultimately correct waveTimer such that its value is not affected by // hitting Blue Octoroks. if (sModFromLosingTime == 0) { - waveTimer = ((void)0, gSaveContext.eventTimer1Value[TIMER_ID_1]) % 500; + waveTimer = ((void)0, gSaveContext.timerCurTime[TIMER_ID_1]) % SECONDS_TO_TIMER(5); } else { - waveTimer = (((void)0, gSaveContext.eventTimer1Value[TIMER_ID_1]) + 250) % 500; + waveTimer = (((void)0, gSaveContext.timerCurTime[TIMER_ID_1]) + SECONDS_TO_TIMER_PRECISE(2, 50)) % + SECONDS_TO_TIMER(5); } // Octoroks begin hiding four seconds after a wave begins. @@ -1314,7 +1315,7 @@ void EnSyatekiMan_Town_RunGame(EnSyatekiMan* this, PlayState* play) { if (this->perGameVar2.octorokHitType != SG_OCTO_HIT_TYPE_NONE) { if (this->perGameVar2.octorokHitType == SG_OCTO_HIT_TYPE_BLUE) { - gSaveContext.eventTimer2Value[TIMER_ID_1] -= 250; + gSaveContext.timerCurSubTime[TIMER_ID_1] -= SECONDS_TO_TIMER_PRECISE(2, 50); sModFromLosingTime = (sModFromLosingTime + 25) % 50; } @@ -1336,11 +1337,11 @@ void EnSyatekiMan_Town_RunGame(EnSyatekiMan* this, PlayState* play) { } } - if (gSaveContext.eventTimer1Value[TIMER_ID_1] == 0) { + if (gSaveContext.timerCurTime[TIMER_ID_1] == SECONDS_TO_TIMER(0)) { this->flagsIndex = 0; this->perGameVar1.octorokState = SG_OCTO_STATE_HIDING; - gSaveContext.eventTimer1Value[TIMER_ID_1] = 0; - gSaveContext.timerState[TIMER_ID_1] = TIMER_STATE_5; + gSaveContext.timerCurTime[TIMER_ID_1] = SECONDS_TO_TIMER(0); + gSaveContext.timerState[TIMER_ID_1] = TIMER_STATE_STOP; player->stateFlags1 |= 0x20; sModFromLosingTime = 0; this->actor.draw = EnSyatekiMan_Draw; diff --git a/src/overlays/actors/ovl_En_Test4/z_en_test4.c b/src/overlays/actors/ovl_En_Test4/z_en_test4.c index 03b836815..2e7162aa1 100644 --- a/src/overlays/actors/ovl_En_Test4/z_en_test4.c +++ b/src/overlays/actors/ovl_En_Test4/z_en_test4.c @@ -396,7 +396,7 @@ void func_80A42AB8(EnTest4* this, PlayState* play) { func_80A41FA4(this, play); } else if (temp_a0 == CLOCK_TIME(6, 0)) { if (CURRENT_DAY == 3) { - func_8011C808(play); + Interface_StartMoonCrash(play); Actor_MarkForDeath(&this->actor); gSaveContext.eventInf[1] |= 0x80; } else if (((sCutscenes[this->unk_144] < 0) || (play->actorCtx.unk5 & 2)) && CURRENT_DAY != 3) { diff --git a/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.c b/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.c index c660772f7..201534dc4 100644 --- a/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.c +++ b/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.c @@ -90,7 +90,7 @@ void func_80AC9FE4(EnTimeTag* this, PlayState* play) { if (ActorCutscene_GetCanPlayNext(this->actor.cutscene)) { ActorCutscene_StartAndSetUnkLinkFields(this->actor.cutscene, &this->actor); this->actionFunc = func_80AC9FD4; - gSaveContext.timerState[TIMER_ID_3] = TIMER_STATE_OFF; + gSaveContext.timerState[TIMER_ID_FINAL_HOURS] = TIMER_STATE_OFF; if (CHECK_QUEST_ITEM(QUEST_REMAINS_ODOWLA) && CHECK_QUEST_ITEM(QUEST_REMAINS_GOHT) && CHECK_QUEST_ITEM(QUEST_REMAINS_GYORG) && CHECK_QUEST_ITEM(QUEST_REMAINS_TWINMOLD)) { gSaveContext.save.weekEventReg[25] |= 2; @@ -107,7 +107,7 @@ void func_80ACA0A8(EnTimeTag* this, PlayState* play) { if (this->actor.cutscene != -1) { this->actionFunc = func_80AC9FE4; ActorCutscene_SetIntentToPlay(this2->actor.cutscene); - gSaveContext.timerState[TIMER_ID_3] = TIMER_STATE_OFF; + gSaveContext.timerState[TIMER_ID_FINAL_HOURS] = TIMER_STATE_OFF; } play->msgCtx.ocarinaMode = 4; } diff --git a/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c index d9f1aea5d..59696baec 100644 --- a/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c +++ b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c @@ -46,13 +46,13 @@ void ObjRoomtimer_Destroy(Actor* thisx, PlayState* play) { ObjRoomtimer* this = THIS; if (this->actor.params != 0x1FF && gSaveContext.timerState[TIMER_ID_4] >= TIMER_STATE_1) { - gSaveContext.timerState[TIMER_ID_4] = TIMER_STATE_5; + gSaveContext.timerState[TIMER_ID_4] = TIMER_STATE_STOP; } } void func_80973CD8(ObjRoomtimer* this, PlayState* play) { if (this->actor.params != 0x1FF) { - func_8010E9F0(TIMER_ID_4, this->actor.params); + Interface_StartTimer(TIMER_ID_4, this->actor.params); } func_800BC154(play, &play->actorCtx, &this->actor, ACTORCAT_PROP); @@ -62,7 +62,7 @@ void func_80973CD8(ObjRoomtimer* this, PlayState* play) { void func_80973D3C(ObjRoomtimer* this, PlayState* play) { if (Flags_GetClearTemp(play, this->actor.room)) { if (this->actor.params != 0x1FF) { - gSaveContext.timerState[TIMER_ID_4] = TIMER_STATE_5; + gSaveContext.timerState[TIMER_ID_4] = TIMER_STATE_STOP; } ActorCutscene_SetIntentToPlay(this->actor.cutscene); this->actionFunc = func_80973DE0; diff --git a/src/overlays/gamestates/ovl_select/z_select.c b/src/overlays/gamestates/ovl_select/z_select.c index 76a9931d4..6653daacd 100644 --- a/src/overlays/gamestates/ovl_select/z_select.c +++ b/src/overlays/gamestates/ovl_select/z_select.c @@ -514,13 +514,13 @@ void MapSelect_UpdateMenu(MapSelectState* this) { if (this->verticalInputAccumulator == 0) { if (CHECK_BTN_ALL(controller1->press.button, BTN_A) || CHECK_BTN_ALL(controller1->press.button, BTN_START)) { - for (i = 0; i < ARRAY_COUNT(gSaveContext.funcTimer3Value); i++) { + for (i = 0; i < ARRAY_COUNT(gSaveContext.timerPausedOsTime); i++) { gSaveContext.timerState[i] = TIMER_STATE_OFF; - gSaveContext.eventTimer1Value[i] = 0; - gSaveContext.eventTimer2Value[i] = 0; - gSaveContext.funcTimer1Value[i] = 0; - gSaveContext.funcTimer2Value[i] = 0; - gSaveContext.funcTimer3Value[i] = 0; + gSaveContext.timerCurTime[i] = 0; + gSaveContext.timerCurSubTime[i] = SECONDS_TO_TIMER(0); + gSaveContext.timerStartOsTime[i] = 0; + gSaveContext.timerEndOsTime[i] = 0; + gSaveContext.timerPausedOsTime[i] = 0; } gSaveContext.minigameState = 0; diff --git a/tools/disasm/functions.txt b/tools/disasm/functions.txt index fb40a8575..90f05eff2 100644 --- a/tools/disasm/functions.txt +++ b/tools/disasm/functions.txt @@ -2093,12 +2093,12 @@ 0x8010DC58:("func_8010DC58",), 0x8010DE38:("func_8010DE38",), 0x8010E028:("Interface_InitVertices",), - 0x8010E968:("Interface_TimerCallback",), - 0x8010E9F0:("func_8010E9F0",), - 0x8010EA9C:("func_8010EA9C",), - 0x8010EB50:("func_8010EB50",), - 0x8010EBA0:("func_8010EBA0",), - 0x8010EC54:("func_8010EC54",), + 0x8010E968:("Interface_PostmanTimerCallback",), + 0x8010E9F0:("Interface_StartTimer",), + 0x8010EA9C:("Interface_StartPostmanTimer",), + 0x8010EB50:("Interface_StartGoronRaceTimer",), + 0x8010EBA0:("Interface_StartBottleTimer",), + 0x8010EC54:("Interface_GetCompressedTimerDigits",), 0x8010EE74:("Interface_NewDay",), 0x8010EF68:("Interface_SetHudVisibility",), 0x8010EF9C:("Interface_UpdateButtonAlphasByStatus",), @@ -2156,10 +2156,10 @@ 0x8011B9E0:("func_8011B9E0",), 0x8011BF70:("func_8011BF70",), 0x8011C4C4:("Interface_DrawMinigamePerfect",), - 0x8011C808:("func_8011C808",), - 0x8011C898:("func_8011C898",), + 0x8011C808:("Interface_StartMoonCrash",), + 0x8011C898:("Interface_GetTimerDigits",), 0x8011CA64:("Interface_DrawTimers",), - 0x8011E3B4:("Interface_UpdateTimers",), + 0x8011E3B4:("Interface_UpdateBottleTimers",), 0x8011E730:("Interface_DrawMinigameIcons",), 0x8011F0E0:("Interface_Draw",), 0x80120F90:("Interface_LoadStory",), @@ -2232,7 +2232,7 @@ 0x80124258:("Player_GetExplosiveHeld",), 0x80124278:("func_80124278",), 0x801242B4:("func_801242B4",), - 0x801242DC:("func_801242DC",), + 0x801242DC:("Player_GetEnvTimerType",), 0x80124420:("func_80124420",), 0x80124618:("func_80124618",), 0x801246F4:("func_801246F4",), diff --git a/tools/disasm/variables.txt b/tools/disasm/variables.txt index fc9c3950b..c8e1781ae 100644 --- a/tools/disasm/variables.txt +++ b/tools/disasm/variables.txt @@ -1074,15 +1074,15 @@ 0x801BF8A8:("sMagicBarOutlinePrimBlue","UNK_TYPE2","",0x2), 0x801BF8AC:("sMagicBorderRatio","UNK_TYPE2","",0x2), 0x801BF8B0:("sMagicBorderStep","UNK_TYPE2","",0x2), - 0x801BF8DC:("D_801BF8DC","UNK_TYPE2","",0x2), - 0x801BF8E0:("D_801BF8E0","UNK_TYPE2","",0x2), - 0x801BF8E4:("D_801BF8E4","UNK_TYPE2","",0x2), - 0x801BF8E8:("D_801BF8E8","UNK_TYPE4","",0x4), - 0x801BF8F0:("D_801BF8F0","u64","",0x8), + 0x801BF8DC:("sEnvTimerType","UNK_TYPE2","",0x2), + 0x801BF8E0:("sEnvTimerActive","UNK_TYPE2","",0x2), + 0x801BF8E4:("sPostmanBunnyHoodState","UNK_TYPE2","",0x2), + 0x801BF8E8:("sTimerPausedOsTime","UNK_TYPE4","",0x4), + 0x801BF8F0:("sBottleTimerPausedOsTime","u64","",0x8), 0x801BF8F8:("D_801BF8F8","u64","[7]",0x38), 0x801BF930:("D_801BF930","u64","[7]",0x38), - 0x801BF968:("D_801BF968","UNK_TYPE4","",0x4), - 0x801BF96C:("D_801BF96C","UNK_TYPE4","",0x4), + 0x801BF968:("sIsTimerPaused","UNK_TYPE4","",0x4), + 0x801BF96C:("sIsBottleTimerPaused","UNK_TYPE4","",0x4), 0x801BF970:("sTimerId","UNK_TYPE4","",0x4), 0x801BF974:("D_801BF974","UNK_TYPE4","",0x4), 0x801BF978:("D_801BF978","UNK_TYPE4","",0x4), @@ -1113,7 +1113,7 @@ 0x801BFA4C:("D_801BFA4C","UNK_TYPE2","",0x2), 0x801BFA64:("D_801BFA64","UNK_TYPE2","",0x2), 0x801BFA74:("D_801BFA74","UNK_TYPE2","",0x2), - 0x801BFA84:("D_801BFA84","UNK_TYPE4","",0x4), + 0x801BFA84:("sPostmanTimerInputBtnAPressed","UNK_TYPE4","",0x4), 0x801BFAB0:("sDoActionTextures","UNK_TYPE1","",0x1), 0x801BFAB8:("magicBorderColors","UNK_TYPE1","",0x1), 0x801BFAC4:("magicBorderIndices","UNK_TYPE1","",0x1), @@ -1161,9 +1161,9 @@ 0x801BFCA8:("D_801BFCA8","UNK_TYPE2","",0x2), 0x801BFCB8:("D_801BFCB8","UNK_TYPE1","",0x1), 0x801BFCC4:("D_801BFCC4","UNK_TYPE4","",0x4), - 0x801BFCE4:("D_801BFCE4","UNK_TYPE4","",0x4), - 0x801BFCE8:("D_801BFCE8","u16","[8]",0x10), - 0x801BFCF8:("D_801BFCF8","UNK_TYPE4","",0x4), + 0x801BFCE4:("sTimerStateTimer","UNK_TYPE4","",0x4), + 0x801BFCE8:("sTimerDigits","u16","[8]",0x10), + 0x801BFCF8:("sTimerBeepSfxSeconds","UNK_TYPE4","",0x4), 0x801BFCFC:("D_801BFCFC","UNK_TYPE4","",0x4), 0x801BFD0C:("D_801BFD0C","UNK_TYPE4","",0x4), 0x801BFD1C:("D_801BFD1C","UNK_TYPE1","",0x1), @@ -4002,7 +4002,7 @@ 0x801F57B4:("D_801F57B4","UNK_TYPE1","",0x1), 0x801F5834:("D_801F5834","UNK_TYPE1","",0x1), 0x801F5840:("gNMIBuffer","s32*","",0x4), - 0x801F5850:("D_801F5850","UNK_TYPE1","",0x1), + 0x801F5850:("sPostmanTimerInput","UNK_TYPE1","",0x1), 0x801F58B0:("D_801F58B0","UNK_TYPE1","",0x1), 0x801F59AC:("D_801F59AC","UNK_TYPE1","",0x1), 0x801F59B0:("D_801F59B0","UNK_TYPE1","",0x1), diff --git a/tools/sizes/code_functions.csv b/tools/sizes/code_functions.csv index d9be06fcf..127780c0f 100644 --- a/tools/sizes/code_functions.csv +++ b/tools/sizes/code_functions.csv @@ -1607,12 +1607,12 @@ asm/non_matchings/code/z_parameter/func_8010D9F4.s,func_8010D9F4,0x8010D9F4,0x99 asm/non_matchings/code/z_parameter/func_8010DC58.s,func_8010DC58,0x8010DC58,0x78 asm/non_matchings/code/z_parameter/func_8010DE38.s,func_8010DE38,0x8010DE38,0x7C asm/non_matchings/code/z_parameter/Interface_InitVertices.s,Interface_InitVertices,0x8010E028,0x250 -asm/non_matchings/code/z_parameter/Interface_TimerCallback.s,Interface_TimerCallback,0x8010E968,0x22 -asm/non_matchings/code/z_parameter/func_8010E9F0.s,func_8010E9F0,0x8010E9F0,0x2B -asm/non_matchings/code/z_parameter/func_8010EA9C.s,func_8010EA9C,0x8010EA9C,0x2D -asm/non_matchings/code/z_parameter/func_8010EB50.s,func_8010EB50,0x8010EB50,0x14 -asm/non_matchings/code/z_parameter/func_8010EBA0.s,func_8010EBA0,0x8010EBA0,0x2D -asm/non_matchings/code/z_parameter/func_8010EC54.s,func_8010EC54,0x8010EC54,0x88 +asm/non_matchings/code/z_parameter/Interface_PostmanTimerCallback.s,Interface_PostmanTimerCallback,0x8010E968,0x22 +asm/non_matchings/code/z_parameter/Interface_StartTimer.s,Interface_StartTimer,0x8010E9F0,0x2B +asm/non_matchings/code/z_parameter/Interface_StartPostmanTimer.s,Interface_StartPostmanTimer,0x8010EA9C,0x2D +asm/non_matchings/code/z_parameter/Interface_StartGoronRaceTimer.s,Interface_StartGoronRaceTimer,0x8010EB50,0x14 +asm/non_matchings/code/z_parameter/Interface_StartBottleTimer.s,Interface_StartBottleTimer,0x8010EBA0,0x2D +asm/non_matchings/code/z_parameter/Interface_GetCompressedTimerDigits.s,Interface_GetCompressedTimerDigits,0x8010EC54,0x88 asm/non_matchings/code/z_parameter/Interface_NewDay.s,Interface_NewDay,0x8010EE74,0x3D asm/non_matchings/code/z_parameter/Interface_SetHudVisibility.s,Interface_SetHudVisibility,0x8010EF68,0xD asm/non_matchings/code/z_parameter/Interface_UpdateButtonAlphasByStatus.s,Interface_UpdateButtonAlphasByStatus,0x8010EF9C,0x4E @@ -1670,10 +1670,10 @@ asm/non_matchings/code/z_parameter/func_8011B5C0.s,func_8011B5C0,0x8011B5C0,0x10 asm/non_matchings/code/z_parameter/func_8011B9E0.s,func_8011B9E0,0x8011B9E0,0x164 asm/non_matchings/code/z_parameter/func_8011BF70.s,func_8011BF70,0x8011BF70,0x155 asm/non_matchings/code/z_parameter/Interface_DrawMinigamePerfect.s,Interface_DrawMinigamePerfect,0x8011C4C4,0xD1 -asm/non_matchings/code/z_parameter/func_8011C808.s,func_8011C808,0x8011C808,0x24 -asm/non_matchings/code/z_parameter/func_8011C898.s,func_8011C898,0x8011C898,0x73 +asm/non_matchings/code/z_parameter/Interface_StartMoonCrash.s,Interface_StartMoonCrash,0x8011C808,0x24 +asm/non_matchings/code/z_parameter/Interface_GetTimerDigits.s,Interface_GetTimerDigits,0x8011C898,0x73 asm/non_matchings/code/z_parameter/Interface_DrawTimers.s,Interface_DrawTimers,0x8011CA64,0x654 -asm/non_matchings/code/z_parameter/Interface_UpdateTimers.s,Interface_UpdateTimers,0x8011E3B4,0xDF +asm/non_matchings/code/z_parameter/Interface_UpdateBottleTimers.s,Interface_UpdateBottleTimers,0x8011E3B4,0xDF asm/non_matchings/code/z_parameter/Interface_DrawMinigameIcons.s,Interface_DrawMinigameIcons,0x8011E730,0x26C asm/non_matchings/code/z_parameter/Interface_Draw.s,Interface_Draw,0x8011F0E0,0x7AC asm/non_matchings/code/z_parameter/Interface_LoadStory.s,Interface_LoadStory,0x80120F90,0x35 @@ -1746,7 +1746,7 @@ asm/non_matchings/code/z_player_lib/Player_ActionToExplosive.s,Player_ActionToEx asm/non_matchings/code/z_player_lib/Player_GetExplosiveHeld.s,Player_GetExplosiveHeld,0x80124258,0x8 asm/non_matchings/code/z_player_lib/func_80124278.s,func_80124278,0x80124278,0xF asm/non_matchings/code/z_player_lib/func_801242B4.s,func_801242B4,0x801242B4,0xA -asm/non_matchings/code/z_player_lib/func_801242DC.s,func_801242DC,0x801242DC,0x51 +asm/non_matchings/code/z_player_lib/Player_GetEnvTimerType.s,Player_GetEnvTimerType,0x801242DC,0x51 asm/non_matchings/code/z_player_lib/func_80124420.s,func_80124420,0x80124420,0x7E asm/non_matchings/code/z_player_lib/func_80124618.s,func_80124618,0x80124618,0x37 asm/non_matchings/code/z_player_lib/func_801246F4.s,func_801246F4,0x801246F4,0x5F