From 48e1537905a9c2a23a3d9c6f0931d8b3e602bad8 Mon Sep 17 00:00:00 2001 From: engineer124 Date: Thu, 11 Aug 2022 21:16:56 -0400 Subject: [PATCH] docs and cleanup --- include/functions.h | 2 +- include/z64.h | 41 +-- include/z64save.h | 37 +- src/code/z_common_data.c | 2 +- src/code/z_demo.c | 10 +- src/code/z_game_over.c | 8 +- src/code/z_kaleido_setup.c | 2 +- src/code/z_message.c | 2 +- src/code/z_parameter.c | 316 +++++++++--------- src/code/z_player_lib.c | 9 +- .../actors/ovl_Door_Warp1/z_door_warp1.c | 2 +- .../actors/ovl_En_Fishing/z_en_fishing.c | 2 +- src/overlays/actors/ovl_En_Fsn/z_en_fsn.c | 4 +- src/overlays/actors/ovl_En_Fu/z_en_fu.c | 2 +- .../z_en_horse_game_check.c | 6 +- .../actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c | 4 +- src/overlays/actors/ovl_En_Ma4/z_en_ma4.c | 4 +- src/overlays/actors/ovl_En_Mag/z_en_mag.c | 4 +- .../actors/ovl_En_Mt_tag/z_en_mt_tag.c | 4 +- src/overlays/actors/ovl_En_Ossan/z_en_ossan.c | 4 +- src/overlays/actors/ovl_En_Sob1/z_en_sob1.c | 4 +- src/overlays/actors/ovl_En_Test4/z_en_test4.c | 4 +- src/overlays/actors/ovl_En_Trt/z_en_trt.c | 4 +- src/overlays/gamestates/ovl_select/z_select.c | 8 +- tools/disasm/functions.txt | 6 +- tools/sizes/code_functions.csv | 6 +- 26 files changed, 261 insertions(+), 236 deletions(-) diff --git a/include/functions.h b/include/functions.h index 0e27f262b..58bb7a3d3 100644 --- a/include/functions.h +++ b/include/functions.h @@ -1855,7 +1855,7 @@ void func_8010EA9C(s16 timeLimit, s16 arg1); // void func_8010EBA0(void); // void func_8010EC54(void); void Interface_NewDay(PlayState* play, s32 day); -void Interface_ChangeHudMode(u16 hudMode); +void Interface_SetHudVisibility(u16 hudVisibility); // void func_80110038(void); // void func_80111CB4(void); // void Interface_SetSceneRestrictions(void); diff --git a/include/z64.h b/include/z64.h index b0cb217da..06ccc6631 100644 --- a/include/z64.h +++ b/include/z64.h @@ -531,32 +531,19 @@ typedef enum { } DoAction; typedef enum { - /* 0 */ HUD_MODE_IDLE, - /* 1 */ HUD_MODE_OFF, - /* 2 */ HUD_MODE_OFF_ALT, // Identical to HUD_MODE_OFF - /* 3 */ HUD_MODE_HEARTS_WITH_DIM_BTN, // Uses Interface_DimButtonAlphas so gives the opportunity to dim only disabled buttons - /* 4 */ HUD_MODE_A, - /* 5 */ HUD_MODE_A_HEARTS_MAGIC_WITH_DIM_BTN, // Uses Interface_DimButtonAlphas so gives the opportunity to dim only disabled buttons - /* 6 */ HUD_MODE_A_HEARTS_MAGIC_MINIMAP_WITH_DIM_BTN, // Uses Interface_DimButtonAlphas so gives the opportunity to dim only disabled buttons - /* 7 */ HUD_MODE_ALL_NO_MINIMAP_W_DISABLED, // Only raises button alphas if not disabled - /* 8 */ HUD_MODE_B_FAST, // reaches target twice as fast - /* 9 */ HUD_MODE_HEARTS_MAGIC, - /* 10 */ HUD_MODE_B, - /* 11 */ HUD_MODE_HEARTS, - /* 12 */ HUD_MODE_A_B_MINIMAP, - /* 13 */ HUD_MODE_HEARTS_MAGIC_WITH_DIM_BTN, // Uses Interface_DimButtonAlphas so gives the opportunity to dim only disabled buttons - /* 14 */ HUD_MODE_HEARTS_MAGIC_C, - /* 15 */ HUD_MODE_ALL_NO_MINIMAP, - /* 16 */ HUD_MODE_A_B_C, - /* 17 */ HUD_MODE_B_MINIMAP, - /* 18 */ HUD_MODE_HEARTS_MAGIC_MINIMAP, - /* 19 */ HUD_MODE_A_HEARTS_MAGIC_MINIMAP, - /* 20 */ HUD_MODE_B_MAGIC, - /* 21 */ HUD_MODE_A_B, - /* 22 */ HUD_MODE_A_B_HEARTS_MAGIC_MINIMAP, - /* 50 */ HUD_MODE_ALL = 50, - /* 52 */ HUD_MODE_OFF_NOW = 52 -} HudMode; + /* 0 */ MINIGAME_STATE_NONE, + /* 1 */ MINIGAME_STATE_COUNTDOWN_START_3, + /* 2 */ MINIGAME_STATE_COUNTDOWN_3, + /* 3 */ MINIGAME_STATE_COUNTDOWN_START_2, + /* 4 */ MINIGAME_STATE_COUNTDOWN_2, + /* 5 */ MINIGAME_STATE_COUNTDOWN_START_1, + /* 6 */ MINIGAME_STATE_COUNTDOWN_1, + /* 7 */ MINIGAME_STATE_COUNTDOWN_START_GO, + /* 8 */ MINIGAME_STATE_COUNTDOWN_GO, + /* 20 */ MINIGAME_STATE_20 = 20, + /* 21 */ MINIGAME_STATE_21, + /* 30 */ MINIGAME_STATE_30 = 30 +} MinigameState; typedef struct { /* 0x000 */ View view; @@ -618,7 +605,7 @@ typedef struct { /* 0x27C */ s16 mapRoomNum; /* 0x27E */ u8 unk_27E; /* 0x27F */ u8 unk_27F; - /* 0x280 */ u8 unk_280; + /* 0x280 */ u8 minigameState; /* 0x282 */ s16 unk_282; /* 0x284 */ s16 unk_284; /* 0x286 */ s16 isMinigamePerfect; diff --git a/include/z64save.h b/include/z64save.h index 7661a7abd..65ee77e6e 100644 --- a/include/z64save.h +++ b/include/z64save.h @@ -86,6 +86,33 @@ typedef enum { /* 99 */ TIMER_ID_NONE = 99, } TimerId; +typedef enum { + /* 0 */ HUD_VISIBILITY_IDLE, + /* 1 */ HUD_VISIBILITY_OFF, + /* 2 */ HUD_VISIBILITY_OFF_ALT, // Identical to HUD_VISIBILITY_OFF + /* 3 */ HUD_VISIBILITY_HEARTS_WITH_DIM_BTN, // Uses Interface_UpdateButtonAlphas so gives the opportunity to dim only disabled buttons + /* 4 */ HUD_VISIBILITY_A, + /* 5 */ HUD_VISIBILITY_A_HEARTS_MAGIC_WITH_DIM_BTN, // Uses Interface_UpdateButtonAlphas so gives the opportunity to dim only disabled buttons + /* 6 */ HUD_VISIBILITY_A_HEARTS_MAGIC_MINIMAP_WITH_DIM_BTN, // Uses Interface_UpdateButtonAlphas so gives the opportunity to dim only disabled buttons + /* 7 */ HUD_VISIBILITY_ALL_NO_MINIMAP_W_DISABLED, // Only raises button alphas if not disabled + /* 8 */ HUD_VISIBILITY_B_FAST, // reaches target twice as fast + /* 9 */ HUD_VISIBILITY_HEARTS_MAGIC, + /* 10 */ HUD_VISIBILITY_B, + /* 11 */ HUD_VISIBILITY_HEARTS, + /* 12 */ HUD_VISIBILITY_A_B_MINIMAP, + /* 13 */ HUD_VISIBILITY_HEARTS_MAGIC_WITH_DIM_BTN, // Uses Interface_UpdateButtonAlphas so gives the opportunity to dim only disabled buttons + /* 14 */ HUD_VISIBILITY_HEARTS_MAGIC_C, + /* 15 */ HUD_VISIBILITY_ALL_NO_MINIMAP, + /* 16 */ HUD_VISIBILITY_A_B_C, + /* 17 */ HUD_VISIBILITY_B_MINIMAP, + /* 18 */ HUD_VISIBILITY_HEARTS_MAGIC_MINIMAP, + /* 19 */ HUD_VISIBILITY_A_HEARTS_MAGIC_MINIMAP, + /* 20 */ HUD_VISIBILITY_B_MAGIC, + /* 21 */ HUD_VISIBILITY_A_B, + /* 22 */ HUD_VISIBILITY_A_B_HEARTS_MAGIC_MINIMAP, + /* 50 */ HUD_VISIBILITY_ALL = 50, + /* 52 */ HUD_VISIBILITY_OFF_NOW = 52 +} HudVisibility; typedef struct SramContext { /* 0x00 */ u8* readBuff; /* 0x04 */ u8 *saveBuf; @@ -283,11 +310,11 @@ typedef struct SaveContext { /* 0x3F16 */ u8 seqIndex; // "old_bgm" /* 0x3F17 */ u8 nightSeqIndex; // "old_env" /* 0x3F18 */ u8 buttonStatus[6]; // "button_item" - /* 0x3F1E */ u8 hudModeDimOnlyDisabledButtons; // if the buttons are requested to dim, only dim disabled buttons "ck_fg" - /* 0x3F20 */ u16 requestHudMode; // triggers the hud to change modes to the requested value. Reset to 0 when target is reached "alpha_type" - /* 0x3F22 */ u16 curHudMode; // current hud mode "prev_alpha_type" - /* 0x3F24 */ u16 hudModeCounter; // number of frames in the transition to a new hud display. Used to step alpha "alpha_count" - /* 0x3F26 */ u16 prevHudMode; // used to store and recover hud display for pause menu and text boxes "last_time_type" + /* 0x3F1E */ u8 hudVisibilityForceButtonAlphasByStatus; // if btn alphas are updated through Interface_UpdateButtonAlphas, instead update them through Interface_UpdateButtonAlphasByStatus "ck_fg" + /* 0x3F20 */ u16 nextHudVisibility; // triggers the hud to change visibility to the requested value. Reset to HUD_VISIBILITY_IDLE when target is reached "alpha_type" + /* 0x3F22 */ u16 hudVisibility; // current hud visibility "prev_alpha_type" + /* 0x3F24 */ u16 hudVisibilityTimer; // number of frames in the transition to a new hud visibility. Used to step alpha "alpha_count" + /* 0x3F26 */ u16 prevHudVisibility; // used to store and recover hud visibility for pause menu and text boxes "last_time_type" /* 0x3F28 */ s16 magicState; // determines magic meter behavior on each frame "magic_flag" /* 0x3F2A */ s16 isMagicRequested; // a request to add magic has been given "recovery_magic_flag" /* 0x3F2C */ s16 magicUnusedFlag; // Set to 0 in func_80812D94, otherwise unused "keep_magic_flag" diff --git a/src/code/z_common_data.c b/src/code/z_common_data.c index 7adb24bdd..c970282a8 100644 --- a/src/code/z_common_data.c +++ b/src/code/z_common_data.c @@ -16,7 +16,7 @@ void SaveContext_Init(void) { gSaveContext.skyboxTime = 0; gSaveContext.dogIsLost = true; gSaveContext.nextTransitionType = TRANS_NEXT_TYPE_DEFAULT; - gSaveContext.prevHudMode = HUD_MODE_ALL; + gSaveContext.prevHudVisibility = HUD_VISIBILITY_ALL; gSaveContext.options.language = 1; gSaveContext.options.audioSetting = 0; diff --git a/src/code/z_demo.c b/src/code/z_demo.c index dd94daf19..4e22370db 100644 --- a/src/code/z_demo.c +++ b/src/code/z_demo.c @@ -105,7 +105,7 @@ s32 func_800EA220(PlayState* play, CutsceneContext* csCtx, f32 target) { } void func_800EA258(PlayState* play, CutsceneContext* csCtx) { - Interface_ChangeHudMode(HUD_MODE_OFF); + Interface_SetHudVisibility(HUD_VISIBILITY_OFF); ShrinkWindow_SetLetterboxTarget(32); if (func_800EA220(play, csCtx, 1.0f)) { Audio_SetCutsceneFlag(true); @@ -115,7 +115,7 @@ void func_800EA258(PlayState* play, CutsceneContext* csCtx) { void func_800EA2B8(PlayState* play, CutsceneContext* csCtx) { func_800ED980(play, csCtx); - Interface_ChangeHudMode(HUD_MODE_OFF); + Interface_SetHudVisibility(HUD_VISIBILITY_OFF); ShrinkWindow_SetLetterboxTarget(32); if (func_800EA220(play, csCtx, 1.0f)) { Audio_SetCutsceneFlag(true); @@ -564,7 +564,7 @@ void Cutscene_TerminatorImpl(PlayState* play, CutsceneContext* csCtx, CsCmdBase* gSaveContext.cutsceneTransitionControl = 1; if ((gSaveContext.gameMode != 0) && (csCtx->frames != cmd->startFrame)) { - gSaveContext.hudModeDimOnlyDisabledButtons = true; + gSaveContext.hudVisibilityForceButtonAlphasByStatus = true; } gSaveContext.save.cutscene = 0; @@ -1100,7 +1100,7 @@ void Cutscene_Command_Textbox(PlayState* play, CutsceneContext* csCtx, CsCmdText } if (originalCsFrames == csCtx->frames) { - Interface_ChangeHudMode(HUD_MODE_OFF); + Interface_SetHudVisibility(HUD_VISIBILITY_OFF); D_801BB124 = 0; D_801BB128 = 0; func_80161C0C(); @@ -1480,7 +1480,7 @@ void func_800EDA84(PlayState* play, CutsceneContext* csCtx) { csCtx->unk_18 = 0xFFFF; if (gSaveContext.cutsceneTrigger == 0) { - Interface_ChangeHudMode(HUD_MODE_OFF); + Interface_SetHudVisibility(HUD_VISIBILITY_OFF); ShrinkWindow_SetLetterboxTarget(32); ShrinkWindow_SetLetterboxMagnitude(0x20); csCtx->state++; diff --git a/src/code/z_game_over.c b/src/code/z_game_over.c index 50705f6f3..9b93910fb 100644 --- a/src/code/z_game_over.c +++ b/src/code/z_game_over.c @@ -57,10 +57,10 @@ void GameOver_Update(PlayState* play) { gSaveContext.buttonStatus[EQUIP_SLOT_C_DOWN] = BTN_ENABLED; gSaveContext.buttonStatus[EQUIP_SLOT_C_RIGHT] = BTN_ENABLED; gSaveContext.buttonStatus[EQUIP_SLOT_A] = BTN_ENABLED; - gSaveContext.hudModeDimOnlyDisabledButtons = false; - gSaveContext.requestHudMode = HUD_MODE_IDLE; - gSaveContext.curHudMode = HUD_MODE_IDLE; - gSaveContext.hudModeCounter = 0; + gSaveContext.hudVisibilityForceButtonAlphasByStatus = false; + gSaveContext.nextHudVisibility = HUD_VISIBILITY_IDLE; + gSaveContext.hudVisibility = HUD_VISIBILITY_IDLE; + gSaveContext.hudVisibilityTimer = 0; Kankyo_InitGameOverLights(play); sGameOverTimer = 20; Rumble_Request(0.0f, 126, 124, 63); diff --git a/src/code/z_kaleido_setup.c b/src/code/z_kaleido_setup.c index 9b8aaac36..44c6c9ba1 100644 --- a/src/code/z_kaleido_setup.c +++ b/src/code/z_kaleido_setup.c @@ -80,7 +80,7 @@ void KaleidoSetup_Update(PlayState* play) { if (!(gSaveContext.eventInf[1] & 0x80) && !(player->stateFlags1 & 0x20)) { if (!(play->actorCtx.unk5 & 2) && !(play->actorCtx.unk5 & 4)) { if ((play->actorCtx.unk268 == 0) && CHECK_BTN_ALL(input->press.button, BTN_START)) { - gSaveContext.prevHudMode = gSaveContext.curHudMode; + gSaveContext.prevHudVisibility = gSaveContext.hudVisibility; pauseCtx->unk_2B9 = 0; pauseCtx->state = 1; func_800F4A10(play); diff --git a/src/code/z_message.c b/src/code/z_message.c index 8fac7223e..607132514 100644 --- a/src/code/z_message.c +++ b/src/code/z_message.c @@ -383,7 +383,7 @@ void func_80151A68(PlayState* play, u16 textId) { XREG(77) = 0x3C; XREG(76) = 0x1C; msgCtx->unk11F1A[0] = msgCtx->unk11F1A[1] = msgCtx->unk11F1A[2] = 0; - Interface_ChangeHudMode(HUD_MODE_OFF); + Interface_SetHudVisibility(HUD_VISIBILITY_OFF); } } diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index d7a05a5cf..9bc72e546 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -708,18 +708,18 @@ void Interface_NewDay(PlayState* play, s32 day) { } } -void Interface_ChangeHudMode(u16 hudMode) { - if (gSaveContext.curHudMode != hudMode) { - gSaveContext.curHudMode = hudMode; - gSaveContext.requestHudMode = hudMode; - gSaveContext.hudModeCounter = 1; +void Interface_SetHudVisibility(u16 hudVisibility) { + if (gSaveContext.hudVisibility != hudVisibility) { + gSaveContext.hudVisibility = hudVisibility; + gSaveContext.nextHudVisibility = hudVisibility; + gSaveContext.hudVisibilityTimer = 1; } } /** - * Slowly restore buttons to the hud unless a button is disabled + * Sets the button alphas to be dimmed for disabled buttons, or to the requested alpha for non-disabled buttons */ -void Interface_RaiseNonDisabledButtonAlphas(PlayState* play, s16 risingAlpha) { +void Interface_UpdateButtonAlphasByStatus(PlayState* play, s16 risingAlpha) { InterfaceContext* interfaceCtx = &play->interfaceCtx; if ((gSaveContext.buttonStatus[EQUIP_SLOT_B] == BTN_DISABLED) || (gSaveContext.unk_1015 == ITEM_NONE)) { @@ -774,15 +774,15 @@ void Interface_RaiseNonDisabledButtonAlphas(PlayState* play, s16 risingAlpha) { } /** - * Slowly diminish button alphas on the hud - * If (gSaveContext.hudModeDimOnlyDisabledButtons), then only dim disabled buttons, - * and raise active button alphas instead + * Lower button alphas on the HUD to the requested value + * If (gSaveContext.hudVisibilityForceButtonAlphasByStatus), then instead update button alphas + * depending on button status */ -void Interface_DimButtonAlphas(PlayState* play, s16 dimmingAlpha, s16 risingAlpha) { +void Interface_UpdateButtonAlphas(PlayState* play, s16 dimmingAlpha, s16 risingAlpha) { InterfaceContext* interfaceCtx = &play->interfaceCtx; - if (gSaveContext.hudModeDimOnlyDisabledButtons) { - Interface_RaiseNonDisabledButtonAlphas(play, risingAlpha); + if (gSaveContext.hudVisibilityForceButtonAlphasByStatus) { + Interface_UpdateButtonAlphasByStatus(play, risingAlpha); return; } @@ -811,11 +811,11 @@ void Interface_UpdateHudAlphas(PlayState* play, s16 dimmingAlpha) { InterfaceContext* interfaceCtx = &play->interfaceCtx; s16 risingAlpha = 255 - dimmingAlpha; - switch (gSaveContext.requestHudMode) { - case HUD_MODE_OFF: - case HUD_MODE_OFF_ALT: - case HUD_MODE_B_FAST: - if (gSaveContext.requestHudMode == HUD_MODE_B_FAST) { + switch (gSaveContext.nextHudVisibility) { + case HUD_VISIBILITY_OFF: + case HUD_VISIBILITY_OFF_ALT: + case HUD_VISIBILITY_B_FAST: + if (gSaveContext.nextHudVisibility == HUD_VISIBILITY_B_FAST) { if (interfaceCtx->bAlpha != 255) { interfaceCtx->bAlpha = risingAlpha; } @@ -855,13 +855,13 @@ void Interface_UpdateHudAlphas(PlayState* play, s16 dimmingAlpha) { break; - case HUD_MODE_HEARTS_WITH_DIM_BTN: - // aAlpha is immediately overwritten in Interface_DimButtonAlphas + case HUD_VISIBILITY_HEARTS_WITH_DIM_BTN: + // aAlpha is immediately overwritten in Interface_UpdateButtonAlphas if ((interfaceCtx->aAlpha != 0) && (interfaceCtx->aAlpha > dimmingAlpha)) { interfaceCtx->aAlpha = dimmingAlpha; } - Interface_DimButtonAlphas(play, dimmingAlpha, risingAlpha + 0); + Interface_UpdateButtonAlphas(play, dimmingAlpha, risingAlpha + 0); if ((interfaceCtx->magicAlpha != 0) && (interfaceCtx->magicAlpha > dimmingAlpha)) { interfaceCtx->magicAlpha = dimmingAlpha; @@ -877,7 +877,7 @@ void Interface_UpdateHudAlphas(PlayState* play, s16 dimmingAlpha) { break; - case HUD_MODE_A: + case HUD_VISIBILITY_A: if ((interfaceCtx->bAlpha != 0) && (interfaceCtx->bAlpha > dimmingAlpha)) { interfaceCtx->bAlpha = dimmingAlpha; } @@ -917,14 +917,14 @@ void Interface_UpdateHudAlphas(PlayState* play, s16 dimmingAlpha) { break; - case HUD_MODE_A_HEARTS_MAGIC_WITH_DIM_BTN: - Interface_DimButtonAlphas(play, dimmingAlpha, risingAlpha); + case HUD_VISIBILITY_A_HEARTS_MAGIC_WITH_DIM_BTN: + Interface_UpdateButtonAlphas(play, dimmingAlpha, risingAlpha); if ((interfaceCtx->minimapAlpha != 0) && (interfaceCtx->minimapAlpha > dimmingAlpha)) { interfaceCtx->minimapAlpha = dimmingAlpha; } - // aAlpha overwrites the value set in Interface_DimButtonAlphas + // aAlpha overwrites the value set in Interface_UpdateButtonAlphas if (interfaceCtx->aAlpha != 255) { interfaceCtx->aAlpha = risingAlpha; } @@ -939,10 +939,10 @@ void Interface_UpdateHudAlphas(PlayState* play, s16 dimmingAlpha) { break; - case HUD_MODE_A_HEARTS_MAGIC_MINIMAP_WITH_DIM_BTN: - Interface_DimButtonAlphas(play, dimmingAlpha, risingAlpha); + case HUD_VISIBILITY_A_HEARTS_MAGIC_MINIMAP_WITH_DIM_BTN: + Interface_UpdateButtonAlphas(play, dimmingAlpha, risingAlpha); - // aAlpha overwrites the value set in Interface_DimButtonAlphas + // aAlpha overwrites the value set in Interface_UpdateButtonAlphas if (interfaceCtx->aAlpha != 255) { interfaceCtx->aAlpha = risingAlpha; } @@ -967,12 +967,12 @@ void Interface_UpdateHudAlphas(PlayState* play, s16 dimmingAlpha) { break; - case HUD_MODE_ALL_NO_MINIMAP_W_DISABLED: + case HUD_VISIBILITY_ALL_NO_MINIMAP_W_DISABLED: if ((interfaceCtx->minimapAlpha != 0) && (interfaceCtx->minimapAlpha > dimmingAlpha)) { interfaceCtx->minimapAlpha = dimmingAlpha; } - Interface_RaiseNonDisabledButtonAlphas(play, risingAlpha); + Interface_UpdateButtonAlphasByStatus(play, risingAlpha); if (interfaceCtx->healthAlpha != 255) { interfaceCtx->healthAlpha = risingAlpha; @@ -984,7 +984,7 @@ void Interface_UpdateHudAlphas(PlayState* play, s16 dimmingAlpha) { break; - case HUD_MODE_HEARTS_MAGIC: + case HUD_VISIBILITY_HEARTS_MAGIC: if ((interfaceCtx->bAlpha != 0) && (interfaceCtx->bAlpha > dimmingAlpha)) { interfaceCtx->bAlpha = dimmingAlpha; } @@ -1019,7 +1019,7 @@ void Interface_UpdateHudAlphas(PlayState* play, s16 dimmingAlpha) { break; - case HUD_MODE_B: + case HUD_VISIBILITY_B: if ((interfaceCtx->aAlpha != 0) && (interfaceCtx->aAlpha > dimmingAlpha)) { interfaceCtx->aAlpha = dimmingAlpha; } @@ -1054,7 +1054,7 @@ void Interface_UpdateHudAlphas(PlayState* play, s16 dimmingAlpha) { break; - case HUD_MODE_HEARTS: + case HUD_VISIBILITY_HEARTS: if ((interfaceCtx->bAlpha != 0) && (interfaceCtx->bAlpha > dimmingAlpha)) { interfaceCtx->bAlpha = dimmingAlpha; } @@ -1089,7 +1089,7 @@ void Interface_UpdateHudAlphas(PlayState* play, s16 dimmingAlpha) { break; - case HUD_MODE_A_B_MINIMAP: + case HUD_VISIBILITY_A_B_MINIMAP: if (interfaceCtx->aAlpha != 255) { interfaceCtx->aAlpha = risingAlpha; } @@ -1130,14 +1130,14 @@ void Interface_UpdateHudAlphas(PlayState* play, s16 dimmingAlpha) { break; - case HUD_MODE_HEARTS_MAGIC_WITH_DIM_BTN: - Interface_DimButtonAlphas(play, dimmingAlpha, risingAlpha); + case HUD_VISIBILITY_HEARTS_MAGIC_WITH_DIM_BTN: + Interface_UpdateButtonAlphas(play, dimmingAlpha, risingAlpha); if ((interfaceCtx->minimapAlpha != 0) && (interfaceCtx->minimapAlpha > dimmingAlpha)) { interfaceCtx->minimapAlpha = dimmingAlpha; } - // aAlpha overwrites the value set in Interface_DimButtonAlphas + // aAlpha overwrites the value set in Interface_UpdateButtonAlphas if ((interfaceCtx->aAlpha != 0) && (interfaceCtx->aAlpha > dimmingAlpha)) { interfaceCtx->aAlpha = dimmingAlpha; } @@ -1152,7 +1152,7 @@ void Interface_UpdateHudAlphas(PlayState* play, s16 dimmingAlpha) { break; - case HUD_MODE_HEARTS_MAGIC_C: + case HUD_VISIBILITY_HEARTS_MAGIC_C: if ((interfaceCtx->bAlpha != 0) && (interfaceCtx->bAlpha > dimmingAlpha)) { interfaceCtx->bAlpha = dimmingAlpha; } @@ -1187,7 +1187,7 @@ void Interface_UpdateHudAlphas(PlayState* play, s16 dimmingAlpha) { break; - case HUD_MODE_ALL_NO_MINIMAP: + case HUD_VISIBILITY_ALL_NO_MINIMAP: if ((interfaceCtx->minimapAlpha != 0) && (interfaceCtx->minimapAlpha > dimmingAlpha)) { interfaceCtx->minimapAlpha = dimmingAlpha; } @@ -1222,7 +1222,7 @@ void Interface_UpdateHudAlphas(PlayState* play, s16 dimmingAlpha) { break; - case HUD_MODE_A_B_C: + case HUD_VISIBILITY_A_B_C: if ((interfaceCtx->minimapAlpha != 0) && (interfaceCtx->minimapAlpha > dimmingAlpha)) { interfaceCtx->minimapAlpha = dimmingAlpha; } @@ -1257,7 +1257,7 @@ void Interface_UpdateHudAlphas(PlayState* play, s16 dimmingAlpha) { break; - case HUD_MODE_B_MINIMAP: + case HUD_VISIBILITY_B_MINIMAP: if ((interfaceCtx->aAlpha != 0) && (interfaceCtx->aAlpha > dimmingAlpha)) { interfaceCtx->aAlpha = dimmingAlpha; } @@ -1292,7 +1292,7 @@ void Interface_UpdateHudAlphas(PlayState* play, s16 dimmingAlpha) { break; - case HUD_MODE_HEARTS_MAGIC_MINIMAP: + case HUD_VISIBILITY_HEARTS_MAGIC_MINIMAP: if ((interfaceCtx->bAlpha != 0) && (interfaceCtx->bAlpha > dimmingAlpha)) { interfaceCtx->bAlpha = dimmingAlpha; } @@ -1327,7 +1327,7 @@ void Interface_UpdateHudAlphas(PlayState* play, s16 dimmingAlpha) { break; - case HUD_MODE_A_HEARTS_MAGIC_MINIMAP: + case HUD_VISIBILITY_A_HEARTS_MAGIC_MINIMAP: if ((interfaceCtx->bAlpha != 0) && (interfaceCtx->bAlpha > dimmingAlpha)) { interfaceCtx->bAlpha = dimmingAlpha; } @@ -1362,7 +1362,7 @@ void Interface_UpdateHudAlphas(PlayState* play, s16 dimmingAlpha) { break; - case HUD_MODE_B_MAGIC: + case HUD_VISIBILITY_B_MAGIC: if ((interfaceCtx->aAlpha != 0) && (interfaceCtx->aAlpha > dimmingAlpha)) { interfaceCtx->aAlpha = dimmingAlpha; } @@ -1397,7 +1397,7 @@ void Interface_UpdateHudAlphas(PlayState* play, s16 dimmingAlpha) { break; - case HUD_MODE_A_B: + case HUD_VISIBILITY_A_B: if (interfaceCtx->aAlpha != 255) { interfaceCtx->aAlpha = risingAlpha; } @@ -1432,7 +1432,7 @@ void Interface_UpdateHudAlphas(PlayState* play, s16 dimmingAlpha) { break; - case HUD_MODE_A_B_HEARTS_MAGIC_MINIMAP: + case HUD_VISIBILITY_A_B_HEARTS_MAGIC_MINIMAP: if ((interfaceCtx->cLeftAlpha != 0) && (interfaceCtx->cLeftAlpha > dimmingAlpha)) { interfaceCtx->cLeftAlpha = dimmingAlpha; } @@ -1515,7 +1515,7 @@ void func_80110038(PlayState* play) { } } - Interface_ChangeHudMode(HUD_MODE_B_FAST); + Interface_SetHudVisibility(HUD_VISIBILITY_B_FAST); } else if (gSaveContext.save.weekEventReg[82] & 8) { for (i = EQUIP_SLOT_C_LEFT; i <= EQUIP_SLOT_C_RIGHT; i++) { if (gSaveContext.buttonStatus[i] == BTN_ENABLED) { @@ -1523,7 +1523,7 @@ void func_80110038(PlayState* play) { } } - Interface_ChangeHudMode(HUD_MODE_A_B_HEARTS_MAGIC_MINIMAP); + Interface_SetHudVisibility(HUD_VISIBILITY_A_B_HEARTS_MAGIC_MINIMAP); } else if (gSaveContext.save.weekEventReg[84] & 0x20) { if (player->currentMask == PLAYER_MASK_FIERCE_DEITY) { for (i = EQUIP_SLOT_C_LEFT; i <= EQUIP_SLOT_C_RIGHT; i++) { @@ -1585,9 +1585,9 @@ void func_80110038(PlayState* play) { } } - if (phi_t3 || (gSaveContext.curHudMode != HUD_MODE_A_B_MINIMAP)) { - gSaveContext.curHudMode = HUD_MODE_IDLE; - Interface_ChangeHudMode(HUD_MODE_A_B_MINIMAP); + if (phi_t3 || (gSaveContext.hudVisibility != HUD_VISIBILITY_A_B_MINIMAP)) { + gSaveContext.hudVisibility = HUD_VISIBILITY_IDLE; + Interface_SetHudVisibility(HUD_VISIBILITY_A_B_MINIMAP); phi_t3 = false; } } else if (player->stateFlags3 & 0x1000000) { @@ -1667,12 +1667,12 @@ void func_80110038(PlayState* play) { } if (phi_t3) { - gSaveContext.curHudMode = HUD_MODE_IDLE; + gSaveContext.hudVisibility = HUD_VISIBILITY_IDLE; } if ((play->transitionTrigger == TRANS_TRIGGER_OFF) && (play->transitionMode == TRANS_MODE_OFF)) { if (ActorCutscene_GetCurrentIndex() == -1) { - Interface_ChangeHudMode(HUD_MODE_ALL); + Interface_SetHudVisibility(HUD_VISIBILITY_ALL); } } } else { @@ -1702,7 +1702,7 @@ void func_80110038(PlayState* play) { gSaveContext.buttonStatus[EQUIP_SLOT_C_DOWN] = BTN_DISABLED; gSaveContext.buttonStatus[EQUIP_SLOT_C_RIGHT] = BTN_DISABLED; phi_t3 = true; - Interface_ChangeHudMode(HUD_MODE_ALL); + Interface_SetHudVisibility(HUD_VISIBILITY_ALL); } } else { if ((interfaceCtx->bButtonDoAction == DO_ACTION_EXPLODE) && @@ -1931,8 +1931,8 @@ void func_80110038(PlayState* play) { if (phi_t3 && (play->activeCamId == CAM_ID_MAIN) && (play->transitionTrigger == TRANS_TRIGGER_OFF) && (play->transitionMode == TRANS_MODE_OFF)) { - gSaveContext.curHudMode = HUD_MODE_IDLE; - Interface_ChangeHudMode(HUD_MODE_ALL); + gSaveContext.hudVisibility = HUD_VISIBILITY_IDLE; + Interface_SetHudVisibility(HUD_VISIBILITY_ALL); } } @@ -1944,7 +1944,7 @@ void func_80111CB4(PlayState* play) { sp28 = false; if (gSaveContext.save.cutscene < 0xFFF0) { - gSaveContext.hudModeDimOnlyDisabledButtons = 0; + gSaveContext.hudVisibilityForceButtonAlphasByStatus = 0; if ((player->stateFlags1 & 0x800000) || (gSaveContext.save.weekEventReg[8] & 1) || (!(gSaveContext.eventInf[4] & 2) && (play->unk_1887C >= 2))) { if ((player->stateFlags1 & 0x800000) && (player->currentMask == PLAYER_MASK_BLAST) && @@ -1955,7 +1955,7 @@ void func_80111CB4(PlayState* play) { if (BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) != ITEM_NONE) { if ((player->transformation == PLAYER_FORM_DEKU) && (gSaveContext.save.weekEventReg[8] & 1)) { - gSaveContext.hudModeDimOnlyDisabledButtons = true; + gSaveContext.hudVisibilityForceButtonAlphasByStatus = true; if (play->sceneNum == SCENE_BOWLING) { if (gSaveContext.buttonStatus[EQUIP_SLOT_B] == BTN_DISABLED) { gSaveContext.buttonStatus[EQUIP_SLOT_B] = BTN_ENABLED; @@ -1970,12 +1970,12 @@ void func_80111CB4(PlayState* play) { gSaveContext.buttonStatus[EQUIP_SLOT_C_RIGHT] = BTN_ENABLED; } - Interface_ChangeHudMode(HUD_MODE_B_MAGIC); + Interface_SetHudVisibility(HUD_VISIBILITY_B_MAGIC); } else { if ((BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) != ITEM_BOW) && (BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) != ITEM_BOMB) && (BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) != ITEM_BOMBCHU)) { - gSaveContext.hudModeDimOnlyDisabledButtons = true; + gSaveContext.hudVisibilityForceButtonAlphasByStatus = true; gSaveContext.buttonStatus[EQUIP_SLOT_B] = BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B); gSaveContext.buttonStatus[EQUIP_SLOT_C_LEFT] = BTN_ENABLED; gSaveContext.buttonStatus[EQUIP_SLOT_C_DOWN] = BTN_ENABLED; @@ -2006,34 +2006,34 @@ void func_80111CB4(PlayState* play) { gSaveContext.buttonStatus[EQUIP_SLOT_C_LEFT] = BTN_DISABLED; gSaveContext.buttonStatus[EQUIP_SLOT_C_DOWN] = BTN_DISABLED; gSaveContext.buttonStatus[EQUIP_SLOT_C_RIGHT] = BTN_DISABLED; - Interface_ChangeHudMode(HUD_MODE_A_HEARTS_MAGIC_MINIMAP_WITH_DIM_BTN); + Interface_SetHudVisibility(HUD_VISIBILITY_A_HEARTS_MAGIC_MINIMAP_WITH_DIM_BTN); } } if (play->transitionMode != TRANS_MODE_OFF) { - Interface_ChangeHudMode(HUD_MODE_OFF); + Interface_SetHudVisibility(HUD_VISIBILITY_OFF); } else if ((gSaveContext.minigameState == 1) && (gSaveContext.save.entranceIndex == 0x6400) && (Cutscene_GetSceneSetupIndex(play) != 0) && (play->transitionTrigger == TRANS_TRIGGER_OFF)) { - Interface_ChangeHudMode(HUD_MODE_A_B_MINIMAP); + Interface_SetHudVisibility(HUD_VISIBILITY_A_B_MINIMAP); } else if ((gSaveContext.minigameState == 1) && (gSaveContext.eventInf[3] & 0x20)) { - Interface_ChangeHudMode(HUD_MODE_B_MINIMAP); + Interface_SetHudVisibility(HUD_VISIBILITY_B_MINIMAP); } else if (!(gSaveContext.save.weekEventReg[0x52] & 8) && (gSaveContext.minigameState == 1)) { - Interface_ChangeHudMode(HUD_MODE_B_FAST); + Interface_SetHudVisibility(HUD_VISIBILITY_B_FAST); } else if (play->unk_1887C >= 2) { - Interface_ChangeHudMode(HUD_MODE_B_FAST); + Interface_SetHudVisibility(HUD_VISIBILITY_B_FAST); } else if (gSaveContext.save.weekEventReg[8] & 1) { gSaveContext.buttonStatus[EQUIP_SLOT_C_LEFT] = BTN_DISABLED; gSaveContext.buttonStatus[EQUIP_SLOT_C_DOWN] = BTN_DISABLED; gSaveContext.buttonStatus[EQUIP_SLOT_C_RIGHT] = BTN_DISABLED; - Interface_ChangeHudMode(HUD_MODE_A_B_MINIMAP); + Interface_SetHudVisibility(HUD_VISIBILITY_A_B_MINIMAP); } else if (player->stateFlags1 & 0x800000) { - Interface_ChangeHudMode(HUD_MODE_A_B_MINIMAP); + Interface_SetHudVisibility(HUD_VISIBILITY_A_B_MINIMAP); } } } else { if (player->stateFlags1 & 0x800000) { - Interface_ChangeHudMode(HUD_MODE_A_B_MINIMAP); + Interface_SetHudVisibility(HUD_VISIBILITY_A_B_MINIMAP); } if (play->sceneNum == SCENE_BOWLING) { @@ -2067,24 +2067,24 @@ void func_80111CB4(PlayState* play) { gSaveContext.buttonStatus[EQUIP_SLOT_C_LEFT] = BTN_DISABLED; gSaveContext.buttonStatus[EQUIP_SLOT_C_DOWN] = BTN_DISABLED; gSaveContext.buttonStatus[EQUIP_SLOT_C_RIGHT] = BTN_DISABLED; - Interface_ChangeHudMode(HUD_MODE_A_HEARTS_MAGIC_MINIMAP_WITH_DIM_BTN); + Interface_SetHudVisibility(HUD_VISIBILITY_A_HEARTS_MAGIC_MINIMAP_WITH_DIM_BTN); if (play->transitionMode != TRANS_MODE_OFF) { - Interface_ChangeHudMode(HUD_MODE_OFF); + Interface_SetHudVisibility(HUD_VISIBILITY_OFF); } else if ((gSaveContext.minigameState == 1) && (gSaveContext.save.entranceIndex == 0x6400) && (Cutscene_GetSceneSetupIndex(play) != 0) && (play->transitionTrigger == TRANS_TRIGGER_OFF)) { - Interface_ChangeHudMode(HUD_MODE_A_B_MINIMAP); + Interface_SetHudVisibility(HUD_VISIBILITY_A_B_MINIMAP); } else if (gSaveContext.minigameState == 1) { - Interface_ChangeHudMode(HUD_MODE_B_FAST); + Interface_SetHudVisibility(HUD_VISIBILITY_B_FAST); } else if (play->unk_1887C >= 2) { - Interface_ChangeHudMode(HUD_MODE_B_FAST); + Interface_SetHudVisibility(HUD_VISIBILITY_B_FAST); } else if (gSaveContext.save.weekEventReg[8] & 1) { gSaveContext.buttonStatus[EQUIP_SLOT_C_LEFT] = BTN_DISABLED; gSaveContext.buttonStatus[EQUIP_SLOT_C_DOWN] = BTN_DISABLED; gSaveContext.buttonStatus[EQUIP_SLOT_C_RIGHT] = BTN_DISABLED; - Interface_ChangeHudMode(HUD_MODE_A_B_MINIMAP); + Interface_SetHudVisibility(HUD_VISIBILITY_A_B_MINIMAP); } else if (player->stateFlags1 & 0x800000) { - Interface_ChangeHudMode(HUD_MODE_A_B_MINIMAP); + Interface_SetHudVisibility(HUD_VISIBILITY_A_B_MINIMAP); } } } else if (D_801BF884 != 0) { @@ -2119,14 +2119,14 @@ void func_80111CB4(PlayState* play) { if (play->msgCtx.choiceIndex != 0) { func_8019F230(); func_80115844(play, 0x12); - Interface_ChangeHudMode(HUD_MODE_A_B); + Interface_SetHudVisibility(HUD_VISIBILITY_A_B); D_801BF884 = 1; REMOVE_QUEST_ITEM(QUEST_PICTOGRAPH); } else { func_8019F208(); interfaceCtx->unk_222 = interfaceCtx->unk_224 = 0; sp28 = true; - Interface_ChangeHudMode(HUD_MODE_ALL); + Interface_SetHudVisibility(HUD_VISIBILITY_ALL); D_801BF884 = 0; if (D_801BF888) { func_801663C4((play->unk_18E5C != NULL) ? play->unk_18E5C : D_801FBB90, @@ -2143,17 +2143,17 @@ void func_80111CB4(PlayState* play) { gSaveContext.buttonStatus[EQUIP_SLOT_C_LEFT] = BTN_DISABLED; gSaveContext.buttonStatus[EQUIP_SLOT_C_DOWN] = BTN_DISABLED; gSaveContext.buttonStatus[EQUIP_SLOT_C_RIGHT] = BTN_DISABLED; - Interface_ChangeHudMode(HUD_MODE_A_B_MINIMAP); + Interface_SetHudVisibility(HUD_VISIBILITY_A_B_MINIMAP); } else if ((gSaveContext.save.entranceIndex == 0xD010) && (play->transitionTrigger == TRANS_TRIGGER_OFF) && (play->transitionMode == TRANS_MODE_OFF)) { gSaveContext.buttonStatus[EQUIP_SLOT_C_LEFT] = BTN_DISABLED; gSaveContext.buttonStatus[EQUIP_SLOT_C_DOWN] = BTN_DISABLED; gSaveContext.buttonStatus[EQUIP_SLOT_C_RIGHT] = BTN_DISABLED; - Interface_ChangeHudMode(HUD_MODE_A_B_HEARTS_MAGIC_MINIMAP); + Interface_SetHudVisibility(HUD_VISIBILITY_A_B_HEARTS_MAGIC_MINIMAP); } else if (play->actorCtx.unk5 & 4) { if (!CHECK_QUEST_ITEM(QUEST_PICTOGRAPH)) { func_80115844(play, 0x12); - Interface_ChangeHudMode(HUD_MODE_A_B); + Interface_SetHudVisibility(HUD_VISIBILITY_A_B); D_801BF884 = 1; } else { func_80166644((u8*)((void)0, gSaveContext.pictoPhoto), @@ -2166,9 +2166,9 @@ void func_80111CB4(PlayState* play) { } } if (sp28) { - gSaveContext.curHudMode = HUD_MODE_IDLE; + gSaveContext.hudVisibility = HUD_VISIBILITY_IDLE; if ((play->transitionTrigger == TRANS_TRIGGER_OFF) && (play->transitionMode == TRANS_MODE_OFF)) { - Interface_ChangeHudMode(HUD_MODE_ALL); + Interface_SetHudVisibility(HUD_VISIBILITY_ALL); } } } @@ -2249,7 +2249,7 @@ void func_80112C0C(PlayState* play, u16 flag) { gSaveContext.buttonStatus[EQUIP_SLOT_C_RIGHT] = gSaveContext.buttonStatus[EQUIP_SLOT_C_DOWN] = gSaveContext.buttonStatus[EQUIP_SLOT_C_LEFT] = gSaveContext.buttonStatus[EQUIP_SLOT_B] = BTN_ENABLED; - Interface_ChangeHudMode(HUD_MODE_ALL_NO_MINIMAP_W_DISABLED); + Interface_SetHudVisibility(HUD_VISIBILITY_ALL_NO_MINIMAP_W_DISABLED); } else { gSaveContext.buttonStatus[EQUIP_SLOT_C_RIGHT] = gSaveContext.buttonStatus[EQUIP_SLOT_C_DOWN] = gSaveContext.buttonStatus[EQUIP_SLOT_C_LEFT] = gSaveContext.buttonStatus[EQUIP_SLOT_B] = BTN_ENABLED; @@ -3756,8 +3756,9 @@ void Interface_DrawItemButtons(PlayState* play) { // C-Up Button Texture, Color & Label (Tatl Text) gDPPipeSync(OVERLAY_DISP++); - if ((gSaveContext.curHudMode == HUD_MODE_OFF) || (gSaveContext.curHudMode == HUD_MODE_OFF_ALT) || - (gSaveContext.curHudMode == HUD_MODE_A_HEARTS_MAGIC_WITH_DIM_BTN) || (msgCtx->msgMode != 0)) { + if ((gSaveContext.hudVisibility == HUD_VISIBILITY_OFF) || + (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) { temp = 70; @@ -4228,7 +4229,7 @@ void Interface_DrawClock(PlayState* play) { /** * Changes Clock's transparancy depending if Player is moving or not and possibly other things */ - if (((void)0, gSaveContext.curHudMode) == HUD_MODE_ALL) { + if (((void)0, gSaveContext.hudVisibility) == HUD_VISIBILITY_ALL) { if (func_801234D4(play) != 0) { D_801BFB2C = 80; D_801BFB30 = 5; @@ -5293,7 +5294,7 @@ void Interface_DrawTimers(PlayState* play) { case TIMER_STATE_1: case TIMER_STATE_9: D_801BFCE4 = 20; - if (interfaceCtx->unk_280 != 0) { + if (interfaceCtx->minigameState != MINIGAME_STATE_NONE) { gSaveContext.timerX[sTimerId] = 26; if (interfaceCtx->magicAlpha != 255) { @@ -5304,7 +5305,8 @@ void Interface_DrawTimers(PlayState* play) { gSaveContext.timerY[sTimerId] = 46; } - if ((interfaceCtx->unk_280 == 8) || (interfaceCtx->unk_280 == 30)) { + if ((interfaceCtx->minigameState == MINIGAME_STATE_COUNTDOWN_GO) || + (interfaceCtx->minigameState == MINIGAME_STATE_30)) { if (gSaveContext.timerState[sTimerId] == TIMER_STATE_1) { gSaveContext.timerState[sTimerId] = TIMER_STATE_4; } else { @@ -5721,7 +5723,7 @@ void Interface_DrawMinigameIcons(PlayState* play) { G_TX_NOLOD, G_TX_NOLOD); sp3E = 110; - sp3C = (interfaceCtx->unk_280 != 0) ? 200 : 56; + sp3C = (interfaceCtx->minigameState != MINIGAME_STATE_NONE) ? 200 : 56; // Draw 6 carrots for (sp42 = 1; sp42 < 7; sp42++, sp3E += 16) { @@ -6100,11 +6102,12 @@ void Interface_Draw(PlayState* play) { func_80119030(play); if ((play->pauseCtx.state == 0) && (play->pauseCtx.debugEditor == DEBUG_EDITOR_NONE)) { - if ((interfaceCtx->unk_280 != 0) && (interfaceCtx->unk_280 < 20)) { + if ((interfaceCtx->minigameState != MINIGAME_STATE_NONE) && + (interfaceCtx->minigameState < MINIGAME_STATE_20)) { // Minigame Countdown - if (((u32)interfaceCtx->unk_280 % 2) == 0) { + if (((u32)interfaceCtx->minigameState % 2) == 0) { - sp2CE = (interfaceCtx->unk_280 >> 1) - 1; + sp2CE = (interfaceCtx->minigameState >> 1) - 1; sp2C0 = interfaceCtx->unk_284 / 100.0f; if (sp2CE == 3) { @@ -6188,8 +6191,8 @@ void Interface_Draw(PlayState* play) { interfaceCtx->unk_222 = interfaceCtx->unk_224 = 0; D_801BF884 = 0; - gSaveContext.curHudMode = HUD_MODE_IDLE; - Interface_ChangeHudMode(HUD_MODE_ALL); + gSaveContext.hudVisibility = HUD_VISIBILITY_IDLE; + Interface_SetHudVisibility(HUD_VISIBILITY_ALL); } else { s16 phi_a2; @@ -6197,7 +6200,7 @@ void Interface_Draw(PlayState* play) { if (D_801BF884 == 2) { D_801BF884 = 3; Message_StartTextbox(play, 0xF8, NULL); - Interface_ChangeHudMode(HUD_MODE_OFF); + Interface_SetHudVisibility(HUD_VISIBILITY_OFF); player->stateFlags1 |= 0x200; } @@ -6288,55 +6291,55 @@ void Interface_Update(PlayState* play) { } // Update hud mode - switch (gSaveContext.requestHudMode) { - case HUD_MODE_OFF: - case HUD_MODE_OFF_ALT: - case HUD_MODE_B_FAST: - dimmingAlpha = 255 - (gSaveContext.hudModeCounter << 5); + switch (gSaveContext.nextHudVisibility) { + case HUD_VISIBILITY_OFF: + case HUD_VISIBILITY_OFF_ALT: + case HUD_VISIBILITY_B_FAST: + dimmingAlpha = 255 - (gSaveContext.hudVisibilityTimer << 5); if (dimmingAlpha < 0) { dimmingAlpha = 0; } Interface_UpdateHudAlphas(play, dimmingAlpha); - gSaveContext.hudModeCounter += 2; + gSaveContext.hudVisibilityTimer += 2; if (dimmingAlpha == 0) { - gSaveContext.requestHudMode = HUD_MODE_IDLE; + gSaveContext.nextHudVisibility = HUD_VISIBILITY_IDLE; } break; - case HUD_MODE_HEARTS_WITH_DIM_BTN: - case HUD_MODE_A: - case HUD_MODE_A_HEARTS_MAGIC_WITH_DIM_BTN: - case HUD_MODE_A_HEARTS_MAGIC_MINIMAP_WITH_DIM_BTN: - case HUD_MODE_ALL_NO_MINIMAP_W_DISABLED: - case HUD_MODE_HEARTS_MAGIC: - case HUD_MODE_B: - case HUD_MODE_HEARTS: - case HUD_MODE_A_B_MINIMAP: - case HUD_MODE_HEARTS_MAGIC_WITH_DIM_BTN: - case HUD_MODE_HEARTS_MAGIC_C: - case HUD_MODE_ALL_NO_MINIMAP: - case HUD_MODE_A_B_C: - case HUD_MODE_B_MINIMAP: - case HUD_MODE_HEARTS_MAGIC_MINIMAP: - case HUD_MODE_A_HEARTS_MAGIC_MINIMAP: - case HUD_MODE_B_MAGIC: - case HUD_MODE_A_B: - case HUD_MODE_A_B_HEARTS_MAGIC_MINIMAP: - dimmingAlpha = 255 - (gSaveContext.hudModeCounter << 5); + case HUD_VISIBILITY_HEARTS_WITH_DIM_BTN: + case HUD_VISIBILITY_A: + case HUD_VISIBILITY_A_HEARTS_MAGIC_WITH_DIM_BTN: + case HUD_VISIBILITY_A_HEARTS_MAGIC_MINIMAP_WITH_DIM_BTN: + case HUD_VISIBILITY_ALL_NO_MINIMAP_W_DISABLED: + case HUD_VISIBILITY_HEARTS_MAGIC: + case HUD_VISIBILITY_B: + case HUD_VISIBILITY_HEARTS: + case HUD_VISIBILITY_A_B_MINIMAP: + case HUD_VISIBILITY_HEARTS_MAGIC_WITH_DIM_BTN: + case HUD_VISIBILITY_HEARTS_MAGIC_C: + case HUD_VISIBILITY_ALL_NO_MINIMAP: + case HUD_VISIBILITY_A_B_C: + case HUD_VISIBILITY_B_MINIMAP: + case HUD_VISIBILITY_HEARTS_MAGIC_MINIMAP: + case HUD_VISIBILITY_A_HEARTS_MAGIC_MINIMAP: + case HUD_VISIBILITY_B_MAGIC: + case HUD_VISIBILITY_A_B: + case HUD_VISIBILITY_A_B_HEARTS_MAGIC_MINIMAP: + dimmingAlpha = 255 - (gSaveContext.hudVisibilityTimer << 5); if (dimmingAlpha < 0) { dimmingAlpha = 0; } Interface_UpdateHudAlphas(play, dimmingAlpha); - gSaveContext.hudModeCounter++; + gSaveContext.hudVisibilityTimer++; if (dimmingAlpha == 0) { - gSaveContext.requestHudMode = HUD_MODE_IDLE; + gSaveContext.nextHudVisibility = HUD_VISIBILITY_IDLE; } break; - case HUD_MODE_ALL: - dimmingAlpha = 255 - (gSaveContext.hudModeCounter << 5); + case HUD_VISIBILITY_ALL: + dimmingAlpha = 255 - (gSaveContext.hudVisibilityTimer << 5); if (dimmingAlpha < 0) { dimmingAlpha = 0; } @@ -6346,7 +6349,7 @@ void Interface_Update(PlayState* play) { risingAlpha = 255; } - Interface_RaiseNonDisabledButtonAlphas(play, risingAlpha); + Interface_UpdateButtonAlphasByStatus(play, risingAlpha); if (gSaveContext.buttonStatus[5] == BTN_DISABLED) { if (interfaceCtx->startAlpha != 70) { @@ -6376,19 +6379,19 @@ void Interface_Update(PlayState* play) { interfaceCtx->minimapAlpha = risingAlpha; } - gSaveContext.hudModeCounter++; + gSaveContext.hudVisibilityTimer++; if (risingAlpha == 255) { - gSaveContext.requestHudMode = HUD_MODE_IDLE; + gSaveContext.nextHudVisibility = HUD_VISIBILITY_IDLE; } break; - case HUD_MODE_OFF_NOW: + case HUD_VISIBILITY_OFF_NOW: // Turn off all Hud immediately - gSaveContext.requestHudMode = HUD_MODE_OFF; + gSaveContext.nextHudVisibility = HUD_VISIBILITY_OFF; Interface_UpdateHudAlphas(play, 0); - gSaveContext.requestHudMode = HUD_MODE_IDLE; + gSaveContext.nextHudVisibility = HUD_VISIBILITY_IDLE; // fallthrough default: break; @@ -6469,45 +6472,49 @@ void Interface_Update(PlayState* play) { // Update Minigame State if ((play->pauseCtx.state == 0) && (play->pauseCtx.debugEditor == DEBUG_EDITOR_NONE)) { - if (interfaceCtx->unk_280) { - switch (interfaceCtx->unk_280) { - case 1: // minigame countdown 3 - case 3: // minigame countdown 2 - case 5: // minigame countdown 1 - case 7: // minigame countdown Go! + if (interfaceCtx->minigameState) { // != MINIGAME_STATE_NONE + switch (interfaceCtx->minigameState) { + case MINIGAME_STATE_COUNTDOWN_START_3: // minigame countdown 3 + case MINIGAME_STATE_COUNTDOWN_START_2: // minigame countdown 2 + case MINIGAME_STATE_COUNTDOWN_START_1: // minigame countdown 1 + case MINIGAME_STATE_COUNTDOWN_START_GO: // minigame countdown Go! interfaceCtx->unk_282 = 255; interfaceCtx->unk_284 = 100; - interfaceCtx->unk_280++; - if (interfaceCtx->unk_280 == 8) { + interfaceCtx->minigameState++; + if (interfaceCtx->minigameState == MINIGAME_STATE_COUNTDOWN_GO) { interfaceCtx->unk_284 = 160; play_sound(NA_SE_SY_START_SHOT); } else { play_sound(NA_SE_SY_WARNING_COUNT_E); } break; - case 2: - case 4: - case 6: + + case MINIGAME_STATE_COUNTDOWN_3: + case MINIGAME_STATE_COUNTDOWN_2: + case MINIGAME_STATE_COUNTDOWN_1: interfaceCtx->unk_282 -= 10; interfaceCtx->unk_284 += 3; if (interfaceCtx->unk_282 < 22) { - interfaceCtx->unk_280++; + interfaceCtx->minigameState++; } break; - case 8: + + case MINIGAME_STATE_COUNTDOWN_GO: interfaceCtx->unk_282 -= 10; if (interfaceCtx->unk_282 <= 150) { - interfaceCtx->unk_280 = 0x1E; + interfaceCtx->minigameState = MINIGAME_STATE_30; } break; - case 20: + + case MINIGAME_STATE_20: interfaceCtx->unk_282 = 0; - interfaceCtx->unk_280++; + interfaceCtx->minigameState++; break; - case 21: + + case MINIGAME_STATE_21: interfaceCtx->unk_282++; if (interfaceCtx->unk_282 >= 18) { - interfaceCtx->unk_280 = 30; + interfaceCtx->minigameState = MINIGAME_STATE_30; } break; } @@ -6529,6 +6536,7 @@ void Interface_Update(PlayState* play) { } } break; + case 2: interfaceCtx->unk_218 += 10466.667f; if (interfaceCtx->unk_218 >= 0.0f) { @@ -6542,6 +6550,7 @@ void Interface_Update(PlayState* play) { Interface_LoadActionLabel(&play->interfaceCtx, action, 0); } break; + case 3: interfaceCtx->unk_218 += 10466.667f; if (interfaceCtx->unk_218 >= 15700.0f) { @@ -6549,6 +6558,7 @@ void Interface_Update(PlayState* play) { interfaceCtx->unk_210 = 2; } break; + case 4: interfaceCtx->unk_218 += 10466.667f; if (interfaceCtx->unk_218 >= 0.0f) { @@ -6742,8 +6752,8 @@ void Interface_Init(PlayState* play) { bzero(interfaceCtx, sizeof(InterfaceContext)); gSaveContext.sunsSongState = SUNSSONG_INACTIVE; - gSaveContext.requestHudMode = HUD_MODE_IDLE; - gSaveContext.curHudMode = HUD_MODE_IDLE; + gSaveContext.nextHudVisibility = HUD_VISIBILITY_IDLE; + gSaveContext.hudVisibility = HUD_VISIBILITY_IDLE; View_Init(&interfaceCtx->view, play->state.gfxCtx); diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index 43892dac8..4b2166421 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -508,7 +508,7 @@ s32 func_8012364C(PlayState* play, Player* player, s32 arg2) { if (arg2 == 1) { return (gSaveContext.buttonStatus[1] != BTN_DISABLED) ? gSaveContext.save.equips.buttonItems[0][EQUIP_SLOT_C_LEFT] - : (gSaveContext.curHudMode == HUD_MODE_A_B_C) + : (gSaveContext.hudVisibility == HUD_VISIBILITY_A_B_C) ? gSaveContext.save.equips.buttonItems[0][EQUIP_SLOT_C_LEFT] : ITEM_NONE; } @@ -516,14 +516,15 @@ s32 func_8012364C(PlayState* play, Player* player, s32 arg2) { if (arg2 == 2) { return (gSaveContext.buttonStatus[2] != BTN_DISABLED) ? gSaveContext.save.equips.buttonItems[0][EQUIP_SLOT_C_DOWN] - : (gSaveContext.curHudMode == HUD_MODE_A_B_C) + : (gSaveContext.hudVisibility == HUD_VISIBILITY_A_B_C) ? gSaveContext.save.equips.buttonItems[0][EQUIP_SLOT_C_DOWN] : ITEM_NONE; } return (gSaveContext.buttonStatus[3] != BTN_DISABLED) ? gSaveContext.save.equips.buttonItems[0][EQUIP_SLOT_C_RIGHT] - : (gSaveContext.curHudMode == HUD_MODE_A_B_C) ? gSaveContext.save.equips.buttonItems[0][EQUIP_SLOT_C_RIGHT] - : ITEM_NONE; + : (gSaveContext.hudVisibility == HUD_VISIBILITY_A_B_C) + ? gSaveContext.save.equips.buttonItems[0][EQUIP_SLOT_C_RIGHT] + : ITEM_NONE; } #pragma GLOBAL_ASM("asm/non_matchings/code/z_player_lib/func_80123810.s") diff --git a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c index 0ea451143..16f89b4d7 100644 --- a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c +++ b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c @@ -598,7 +598,7 @@ void func_808B9F10(DoorWarp1* this, PlayState* play) { if ((this->unk_203 == 0) && func_808B866C(this, play) && !Play_InCsMode(play) && (this->unk_203 == 0)) { Player* player = GET_PLAYER(play); - Interface_ChangeHudMode(HUD_MODE_OFF); + Interface_SetHudVisibility(HUD_VISIBILITY_OFF); func_800B7298(play, &this->dyna.actor, 9); player->unk_3A0.x = this->dyna.actor.world.pos.x; player->unk_3A0.z = this->dyna.actor.world.pos.z; diff --git a/src/overlays/actors/ovl_En_Fishing/z_en_fishing.c b/src/overlays/actors/ovl_En_Fishing/z_en_fishing.c index 169f7025b..40c75c954 100644 --- a/src/overlays/actors/ovl_En_Fishing/z_en_fishing.c +++ b/src/overlays/actors/ovl_En_Fishing/z_en_fishing.c @@ -5166,7 +5166,7 @@ void EnFishing_UpdateOwner(Actor* thisx, PlayState* play2) { sSubCamAt.y = mainCam->at.y; sSubCamAt.z = mainCam->at.z; D_8090CD4C = 2; - Interface_ChangeHudMode(HUD_MODE_A_B_MINIMAP); + Interface_SetHudVisibility(HUD_VISIBILITY_A_B_MINIMAP); sSubCamVelFactor = 0.0f; // fallthrough case 2: diff --git a/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c b/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c index ff9315a54..96aebb8cf 100644 --- a/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c +++ b/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c @@ -393,7 +393,7 @@ void EnFsn_EndInteraction(EnFsn* this, PlayState* play) { Actor_ProcessTalkRequest(&this->actor, &play->state); play->msgCtx.msgMode = 0x43; play->msgCtx.stateTimer = 4; - Interface_ChangeHudMode(HUD_MODE_ALL); + Interface_SetHudVisibility(HUD_VISIBILITY_ALL); this->drawCursor = 0; this->stickLeftPrompt.isEnabled = false; this->stickRightPrompt.isEnabled = false; @@ -1161,7 +1161,7 @@ void EnFsn_HandleCanPlayerBuyItem(EnFsn* this, PlayState* play) { Actor_PickUp(&this->actor, play, this->items[this->cursorIdx]->getItemId, 300.0f, 300.0f); play->msgCtx.msgMode = 0x43; play->msgCtx.stateTimer = 4; - Interface_ChangeHudMode(HUD_MODE_ALL); + Interface_SetHudVisibility(HUD_VISIBILITY_ALL); this->drawCursor = 0; this->shopItemSelectedTween = 0.0f; item = this->items[this->cursorIdx]; 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 65ccb7177..93550ef4d 100644 --- a/src/overlays/actors/ovl_En_Fu/z_en_fu.c +++ b/src/overlays/actors/ovl_En_Fu/z_en_fu.c @@ -821,7 +821,7 @@ void func_8096326C(EnFu* this, PlayState* play) { void func_809632D0(EnFu* this) { if (gSaveContext.save.playerForm == PLAYER_FORM_DEKU) { - Interface_ChangeHudMode(HUD_MODE_ALL); + Interface_SetHudVisibility(HUD_VISIBILITY_ALL); } gSaveContext.save.weekEventReg[8] &= (u8)~1; 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 de20a27ff..83cf73e9e 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 @@ -122,7 +122,7 @@ s32 func_808F8CCC(EnHorseGameCheck* this, PlayState* play2) { } func_8010E9F0(TIMER_ID_4, 0); - play->interfaceCtx.unk_280 = 1; + play->interfaceCtx.minigameState = 1; this->horse1 = (EnHorse*)Actor_Spawn(&play->actorCtx, play, ACTOR_EN_HORSE, -1149.0f, -106.0f, 470.0f, 0, 0x7FFF, 0, ENHORSE_PARAMS(ENHORSE_PARAM_BANDIT, ENHORSE_4)); @@ -212,10 +212,10 @@ s32 func_808F8FAC(EnHorseGameCheck* this, PlayState* play) { if ((this->unk_168 > 50) && !(this->unk_164 & 2)) { this->unk_164 |= 2; - } else if ((play->interfaceCtx.unk_280 >= 8) && !(this->unk_164 & 1)) { + } else if ((play->interfaceCtx.minigameState >= 8) && !(this->unk_164 & 1)) { this->unk_164 |= 1; horse->inRace = true; - } else if ((play->interfaceCtx.unk_280 >= 8) && !(this->unk_164 & 8)) { + } else if ((play->interfaceCtx.minigameState >= 8) && !(this->unk_164 & 8)) { EnHorse* horse = this->horse1; horse->inRace = true; 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 8b5292692..24f9e202f 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 @@ -284,7 +284,7 @@ void func_80C1410C(EnJgameTsn* this, PlayState* play) { player->stateFlags1 |= 0x20; func_801A2BB8(0x25); - play->interfaceCtx.unk_280 = 1; + play->interfaceCtx.minigameState = 1; Interface_InitMinigame(play); gSaveContext.save.weekEventReg[90] |= 0x20; func_8010E9F0(TIMER_ID_4, 120); @@ -294,7 +294,7 @@ void func_80C1410C(EnJgameTsn* this, PlayState* play) { void func_80C1418C(EnJgameTsn* this, PlayState* play) { Player* player = GET_PLAYER(play); - if (play->interfaceCtx.unk_280 == 8) { + if (play->interfaceCtx.minigameState == 8) { func_80C141DC(this); player->stateFlags1 &= ~0x20; } 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 9cbd090fa..eb0300a0a 100644 --- a/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c +++ b/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c @@ -688,7 +688,7 @@ void EnMa4_HorsebackGameTalking(EnMa4* this, PlayState* play) { void EnMa4_InitHorsebackGame(EnMa4* this, PlayState* play) { Player* player = GET_PLAYER(play); - play->interfaceCtx.unk_280 = 1; + play->interfaceCtx.minigameState = 1; func_8010E9F0(TIMER_ID_4, 0); gSaveContext.save.weekEventReg[8] |= 1; Interface_InitMinigame(play); @@ -699,7 +699,7 @@ void EnMa4_InitHorsebackGame(EnMa4* this, PlayState* play) { void EnMa4_SetupHorsebackGameWait(EnMa4* this, PlayState* play) { Player* player = GET_PLAYER(play); - if (play->interfaceCtx.unk_280 == 8) { + if (play->interfaceCtx.minigameState == 8) { this->actionFunc = EnMa4_HorsebackGameWait; player->stateFlags1 &= ~0x20; } diff --git a/src/overlays/actors/ovl_En_Mag/z_en_mag.c b/src/overlays/actors/ovl_En_Mag/z_en_mag.c index 0e1323e27..cee1132a4 100644 --- a/src/overlays/actors/ovl_En_Mag/z_en_mag.c +++ b/src/overlays/actors/ovl_En_Mag/z_en_mag.c @@ -135,7 +135,7 @@ void EnMag_Init(Actor* thisx, PlayState* play) { this->unk11F02 = 30; this->unk11F00 = this->state = MAG_STATE_INITIAL; - if (gSaveContext.hudModeDimOnlyDisabledButtons) { + if (gSaveContext.hudVisibilityForceButtonAlphasByStatus) { this->mainTitleAlpha = 210; this->unk11F32 = 255; this->copyrightAlpha = 255; @@ -158,7 +158,7 @@ void EnMag_Init(Actor* thisx, PlayState* play) { this->displayEffectEnvColor[1] = 255; this->displayEffectEnvColor[2] = 155; - gSaveContext.hudModeDimOnlyDisabledButtons = false; + gSaveContext.hudVisibilityForceButtonAlphasByStatus = false; this->state = MAG_STATE_FADE_IN_MASK; sInputDelayTimer = 20; gSaveContext.transFadeDuration = 1; 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 c7731230a..454f7e963 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 @@ -315,11 +315,11 @@ void EnMttag_RaceStart(EnMttag* this, PlayState* play) { } else { if (DECR(this->timer) == 60) { func_8010E9F0(TIMER_ID_4, 0); - play->interfaceCtx.unk_280 = 1; + play->interfaceCtx.minigameState = 1; Audio_QueueSeqCmd(NA_BGM_GORON_RACE | 0x8000); play->envCtx.unk_E4 = 0xFE; player->stateFlags1 &= ~0x20; - } else if ((this->timer < 60) && (play->interfaceCtx.unk_280 == 8)) { + } else if ((this->timer < 60) && (play->interfaceCtx.minigameState == 8)) { this->timer = 0; gSaveContext.eventInf[1] |= 1; this->actionFunc = EnMttag_Race; diff --git a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c index 2c7e4f06a..d704630ce 100644 --- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c +++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c @@ -302,7 +302,7 @@ void EnOssan_EndInteraction(PlayState* play, EnOssan* this) { Actor_ProcessTalkRequest(&this->actor, &play->state); play->msgCtx.msgMode = 0x43; play->msgCtx.stateTimer = 4; - Interface_ChangeHudMode(HUD_MODE_ALL); + Interface_SetHudVisibility(HUD_VISIBILITY_ALL); this->drawCursor = 0; this->stickLeftPrompt.isEnabled = false; this->stickRightPrompt.isEnabled = false; @@ -985,7 +985,7 @@ void EnOssan_SetupBuyItemWithFanfare(PlayState* play, EnOssan* this) { play->msgCtx.msgMode = 0x43; play->msgCtx.stateTimer = 4; player->stateFlags2 &= ~0x20000000; - Interface_ChangeHudMode(HUD_MODE_ALL); + Interface_SetHudVisibility(HUD_VISIBILITY_ALL); this->drawCursor = 0; EnOssan_SetupAction(this, EnOssan_BuyItemWithFanfare); } diff --git a/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c b/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c index 627250635..b5386bdb0 100644 --- a/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c +++ b/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c @@ -442,7 +442,7 @@ void EnSob1_EndInteraction(PlayState* play, EnSob1* this) { Actor_ProcessTalkRequest(&this->actor, &play->state); play->msgCtx.msgMode = 0x43; play->msgCtx.stateTimer = 4; - Interface_ChangeHudMode(HUD_MODE_ALL); + Interface_SetHudVisibility(HUD_VISIBILITY_ALL); this->drawCursor = 0; this->stickLeftPrompt.isEnabled = false; this->stickRightPrompt.isEnabled = false; @@ -932,7 +932,7 @@ void EnSob1_SetupBuyItemWithFanfare(PlayState* play, EnSob1* this) { play->msgCtx.msgMode = 0x43; play->msgCtx.stateTimer = 4; player->stateFlags2 &= ~0x20000000; - Interface_ChangeHudMode(HUD_MODE_ALL); + Interface_SetHudVisibility(HUD_VISIBILITY_ALL); this->drawCursor = 0; EnSob1_SetupAction(this, EnSob1_BuyItemWithFanfare); } 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 d782881b0..9b2907023 100644 --- a/src/overlays/actors/ovl_En_Test4/z_en_test4.c +++ b/src/overlays/actors/ovl_En_Test4/z_en_test4.c @@ -514,9 +514,9 @@ void func_80A42F20(EnTest4* this, PlayState* play) { if (sCurrentCs >= 0) { ActorCutscene_Stop(sCurrentCs); } - gSaveContext.curHudMode = HUD_MODE_IDLE; + gSaveContext.hudVisibility = HUD_VISIBILITY_IDLE; gSaveContext.eventInf[1] &= (u8)~0x80; - Interface_ChangeHudMode(HUD_MODE_ALL); + Interface_SetHudVisibility(HUD_VISIBILITY_ALL); } } diff --git a/src/overlays/actors/ovl_En_Trt/z_en_trt.c b/src/overlays/actors/ovl_En_Trt/z_en_trt.c index 01cf781b6..3685d24a2 100644 --- a/src/overlays/actors/ovl_En_Trt/z_en_trt.c +++ b/src/overlays/actors/ovl_En_Trt/z_en_trt.c @@ -206,7 +206,7 @@ void EnTrt_EndInteraction(PlayState* play, EnTrt* this) { Actor_ProcessTalkRequest(&this->actor, &play->state); play->msgCtx.msgMode = 0x43; play->msgCtx.stateTimer = 4; - Interface_ChangeHudMode(HUD_MODE_ALL); + Interface_SetHudVisibility(HUD_VISIBILITY_ALL); this->drawCursor = 0; this->stickLeftPrompt.isEnabled = false; this->stickRightPrompt.isEnabled = false; @@ -640,7 +640,7 @@ void EnTrt_SetupBuyItemWithFanfare(PlayState* play, EnTrt* this) { play->msgCtx.msgMode = 0x43; play->msgCtx.stateTimer = 4; player->stateFlags2 &= ~0x20000000; - Interface_ChangeHudMode(HUD_MODE_ALL); + Interface_SetHudVisibility(HUD_VISIBILITY_ALL); this->drawCursor = 0; this->actionFunc = EnTrt_BuyItemWithFanfare; } diff --git a/src/overlays/gamestates/ovl_select/z_select.c b/src/overlays/gamestates/ovl_select/z_select.c index 2f0ffdd4a..ccc30f79e 100644 --- a/src/overlays/gamestates/ovl_select/z_select.c +++ b/src/overlays/gamestates/ovl_select/z_select.c @@ -27,10 +27,10 @@ void MapSelect_LoadGame(MapSelectState* this, u32 entranceIndex, s32 opt) { gSaveContext.buttonStatus[EQUIP_SLOT_C_DOWN] = BTN_ENABLED; gSaveContext.buttonStatus[EQUIP_SLOT_C_RIGHT] = BTN_ENABLED; gSaveContext.buttonStatus[EQUIP_SLOT_A] = BTN_ENABLED; - gSaveContext.hudModeDimOnlyDisabledButtons = false; - gSaveContext.requestHudMode = HUD_MODE_IDLE; - gSaveContext.curHudMode = HUD_MODE_IDLE; - gSaveContext.hudModeCounter = 0; + gSaveContext.hudVisibilityForceButtonAlphasByStatus = false; + gSaveContext.nextHudVisibility = HUD_VISIBILITY_IDLE; + gSaveContext.hudVisibility = HUD_VISIBILITY_IDLE; + gSaveContext.hudVisibilityTimer = 0; Audio_QueueSeqCmd(NA_BGM_STOP); gSaveContext.save.entranceIndex = entranceIndex; diff --git a/tools/disasm/functions.txt b/tools/disasm/functions.txt index c28376fd1..f39c5b276 100644 --- a/tools/disasm/functions.txt +++ b/tools/disasm/functions.txt @@ -2100,9 +2100,9 @@ 0x8010EBA0:("func_8010EBA0",), 0x8010EC54:("func_8010EC54",), 0x8010EE74:("Interface_NewDay",), - 0x8010EF68:("Interface_ChangeHudMode",), - 0x8010EF9C:("Interface_RaiseNonDisabledButtonAlphas",), - 0x8010F0D4:("Interface_DimButtonAlphas",), + 0x8010EF68:("Interface_SetHudVisibility",), + 0x8010EF9C:("Interface_UpdateButtonAlphasByStatus",), + 0x8010F0D4:("Interface_UpdateButtonAlphas",), 0x8010F1A8:("Interface_UpdateHudAlphas",), 0x80110038:("func_80110038",), 0x80111CB4:("func_80111CB4",), diff --git a/tools/sizes/code_functions.csv b/tools/sizes/code_functions.csv index cf5cf6639..76ba70d03 100644 --- a/tools/sizes/code_functions.csv +++ b/tools/sizes/code_functions.csv @@ -1614,9 +1614,9 @@ 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_NewDay.s,Interface_NewDay,0x8010EE74,0x3D -asm/non_matchings/code/z_parameter/Interface_ChangeHudMode.s,Interface_ChangeHudMode,0x8010EF68,0xD -asm/non_matchings/code/z_parameter/Interface_RaiseNonDisabledButtonAlphas.s,Interface_RaiseNonDisabledButtonAlphas,0x8010EF9C,0x4E -asm/non_matchings/code/z_parameter/Interface_DimButtonAlphas.s,Interface_DimButtonAlphas,0x8010F0D4,0x35 +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 +asm/non_matchings/code/z_parameter/Interface_UpdateButtonAlphas.s,Interface_UpdateButtonAlphas,0x8010F0D4,0x35 asm/non_matchings/code/z_parameter/Interface_UpdateHudAlphas.s,Interface_UpdateHudAlphas,0x8010F1A8,0x3A4 asm/non_matchings/code/z_parameter/func_80110038.s,func_80110038,0x80110038,0x71F asm/non_matchings/code/z_parameter/func_80111CB4.s,func_80111CB4,0x80111CB4,0x34C