From 9bf6bedd756ecbdbd72dd93ef5869004e8f6a1e9 Mon Sep 17 00:00:00 2001 From: engineer124 Date: Thu, 29 Sep 2022 21:13:54 -0400 Subject: [PATCH] misc docs --- include/functions.h | 2 +- include/variables.h | 4 +- include/z64.h | 2 +- include/z64actor.h | 2 +- include/z64player.h | 2 +- include/z64save.h | 2 +- src/code/code_8012EC80.c | 2 +- src/code/z_demo.c | 4 +- src/code/z_kaleido_setup.c | 2 +- src/code/z_parameter.c | 843 +++++++++--------- .../ovl_Bg_Crace_Movebg/z_bg_crace_movebg.c | 2 +- .../z_bg_ikana_rotaryroom.c | 2 +- .../actors/ovl_Bg_Ingate/z_bg_ingate.c | 2 +- .../actors/ovl_En_Kakasi/z_en_kakasi.c | 2 +- src/overlays/actors/ovl_En_Test4/z_en_test4.c | 4 +- tools/disasm/functions.txt | 4 +- tools/disasm/variables.txt | 4 +- tools/sizes/code_functions.csv | 4 +- 18 files changed, 448 insertions(+), 441 deletions(-) diff --git a/include/functions.h b/include/functions.h index e44e818ad..97b78dada 100644 --- a/include/functions.h +++ b/include/functions.h @@ -1817,7 +1817,7 @@ void Interface_StartTimer(s16 timerId, s16 timeLimit); void Interface_StartPostmanTimer(s16 timeLimit, s16 bunnyHoodState); void Interface_NewDay(PlayState* play, s32 day); void Interface_SetHudVisibility(u16 hudVisibility); -void func_80110038(PlayState* play); +void Interface_UpdateButtonsPart2(PlayState* play); void Interface_SetSceneRestrictions(PlayState* play); void Interface_InitMinigame(PlayState* play); void Interface_LoadItemIconImpl(PlayState* play, u8 btn); diff --git a/include/variables.h b/include/variables.h index abb01f23a..4fbdccd9b 100644 --- a/include/variables.h +++ b/include/variables.h @@ -1020,8 +1020,8 @@ extern UNK_PTR D_801BF5C0; // extern UNK_TYPE1 D_801BF68C; // extern UNK_TYPE1 D_801BF6C0; // extern UNK_TYPE1 D_801BF79E; -// extern UNK_TYPE2 D_801BF884; -// extern UNK_TYPE2 D_801BF888; +// extern UNK_TYPE2 sPictographState; +// extern UNK_TYPE2 sPictographPhotoBeingTaken; // extern UNK_TYPE2 sHBAScoreTier; // extern UNK_TYPE2 sMinigameScoreDigits; // extern UNK_TYPE2 sCUpInvisible; diff --git a/include/z64.h b/include/z64.h index 421725167..9e619ba60 100644 --- a/include/z64.h +++ b/include/z64.h @@ -1212,7 +1212,7 @@ struct PlayState { /* 0x1883C */ Mtx* billboardMtx; /* 0x18840 */ u32 gameplayFrames; /* 0x18844 */ u8 unk_18844; - /* 0x18845 */ u8 unk_18845; + /* 0x18845 */ u8 haltAllActors; /* 0x18846 */ s16 numSetupActors; /* 0x18848 */ u8 numRooms; /* 0x1884C */ RomFile* roomList; diff --git a/include/z64actor.h b/include/z64actor.h index b11078316..4b2f9e7c4 100644 --- a/include/z64actor.h +++ b/include/z64actor.h @@ -309,7 +309,7 @@ typedef enum { #define ACTORCTX_FLAG_0 (1 << 0) #define ACTORCTX_FLAG_1 (1 << 1) -#define ACTORCTX_FLAG_2 (1 << 2) +#define ACTORCTX_FLAG_PICTOGRAPH_ON (1 << 2) #define ACTORCTX_FLAG_3 (1 << 3) #define ACTORCTX_FLAG_4 (1 << 4) #define ACTORCTX_FLAG_5 (1 << 5) diff --git a/include/z64player.h b/include/z64player.h index 2f101b558..0c1c36c3c 100644 --- a/include/z64player.h +++ b/include/z64player.h @@ -636,7 +636,7 @@ typedef struct Player { /* 0xB5D */ u8 unk_B5D; /* 0xB5E */ u8 unk_B5E; /* 0xB5F */ u8 unk_B5F; - /* 0xB60 */ u16 unk_B60; // blast mask timer? + /* 0xB60 */ u16 blastMaskTimer; /* 0xB62 */ s16 unk_B62; /* 0xB64 */ u8 unk_B64; /* 0xB65 */ u8 unk_B65; diff --git a/include/z64save.h b/include/z64save.h index 73c1eefe7..2cbd88c39 100644 --- a/include/z64save.h +++ b/include/z64save.h @@ -297,7 +297,7 @@ typedef struct SaveContext { /* 0x0000 */ Save save; /* 0x100C */ u8 eventInf[8]; // "event_inf" /* 0x1014 */ u8 unk_1014; // "stone_set_flag" - /* 0x1015 */ u8 unk_1015; + /* 0x1015 */ u8 bButtonStatus; /* 0x1016 */ u16 jinxTimer; /* 0x1018 */ s16 rupeeAccumulator; // "lupy_udct" /* 0x101A */ u8 bottleTimerStates[BOTTLE_MAX]; // See the `BottleTimerState` enum. "bottle_status" diff --git a/src/code/code_8012EC80.c b/src/code/code_8012EC80.c index c16d0a723..a572e61ee 100644 --- a/src/code/code_8012EC80.c +++ b/src/code/code_8012EC80.c @@ -477,7 +477,7 @@ u16 gScenesPerRegion[11][27] = { s32 Inventory_GetBtnBItem(PlayState* play) { if (gSaveContext.buttonStatus[EQUIP_SLOT_B] == BTN_DISABLED) { return ITEM_NONE; - } else if (gSaveContext.unk_1015 == ITEM_NONE) { + } else if (gSaveContext.bButtonStatus == BTN_DISABLED) { return ITEM_NONE; } else if (CUR_FORM_EQUIP(EQUIP_SLOT_B) == ITEM_NONE) { if (play->interfaceCtx.bButtonDoActionActive) { diff --git a/src/code/z_demo.c b/src/code/z_demo.c index 4453bd674..69b015ff3 100644 --- a/src/code/z_demo.c +++ b/src/code/z_demo.c @@ -233,10 +233,10 @@ void Cutscene_Command_Misc(PlayState* play, CutsceneContext* csCtx, CsCmdBase* c } break; case 0xE: - play->unk_18845 = 1; + play->haltAllActors = true; break; case 0xF: - play->unk_18845 = 0; + play->haltAllActors = false; break; case 0x10: if (isStartFrame) { diff --git a/src/code/z_kaleido_setup.c b/src/code/z_kaleido_setup.c index 1135f2de9..d1f4d0ca2 100644 --- a/src/code/z_kaleido_setup.c +++ b/src/code/z_kaleido_setup.c @@ -79,7 +79,7 @@ void KaleidoSetup_Update(PlayState* play) { (gSaveContext.magicState != MAGIC_STATE_FILL)) { if (!(gSaveContext.eventInf[1] & 0x80) && !(player->stateFlags1 & 0x20)) { if (!(play->actorCtx.flags & ACTORCTX_FLAG_1) && - !(play->actorCtx.flags & ACTORCTX_FLAG_2)) { + !(play->actorCtx.flags & ACTORCTX_FLAG_PICTOGRAPH_ON)) { if ((play->actorCtx.unk268 == 0) && CHECK_BTN_ALL(input->press.button, BTN_START)) { gSaveContext.prevHudVisibility = gSaveContext.hudVisibility; pauseCtx->itemDescriptionOn = false; diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index c4b67e10f..c2fd698f3 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -15,6 +15,13 @@ void func_801663C4(u8* arg0, u8* arg1, u32 arg2); extern Gfx D_0E0001C8[]; // Display List extern Gfx D_0E0002E0[]; // gScreenFillDL +typedef enum { + /* 0 */ PICTOGRAPH_STATE_OFF, // Not using the pictograph + /* 1 */ PICTOGRAPH_STATE_LENS, // Looking through the lens of the pictograph + /* 2 */ PICTOGRAPH_STATE_SETUP_PHOTO, // Looking at the photo currently taken + /* 3 */ PICTOGRAPH_STATE_PHOTO +} PictographState; + // TODO extract this information from the texture definitions themselves #define DO_ACTION_TEX_WIDTH 48 #define DO_ACTION_TEX_HEIGHT 16 @@ -152,8 +159,8 @@ RestrictionFlags sRestrictionFlags[] = { { SCENE_ALLEY, SET_RESTRICTIONS(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) }, }; -s16 D_801BF884 = 0; // pictoBox related -s16 D_801BF888 = false; // pictoBox related +s16 sPictographState = PICTOGRAPH_STATE_OFF; +s16 sPictographPhotoBeingTaken = false; // pictoBox related s16 sHBAScoreTier = 0; // Remnant of OoT, non-functional @@ -734,7 +741,7 @@ void Interface_SetHudVisibility(u16 hudVisibility) { void Interface_UpdateButtonAlphasByStatus(PlayState* play, s16 risingAlpha) { InterfaceContext* interfaceCtx = &play->interfaceCtx; - if ((gSaveContext.buttonStatus[EQUIP_SLOT_B] == BTN_DISABLED) || (gSaveContext.unk_1015 == ITEM_NONE)) { + if ((gSaveContext.buttonStatus[EQUIP_SLOT_B] == BTN_DISABLED) || (gSaveContext.bButtonStatus == BTN_DISABLED)) { if (interfaceCtx->bAlpha != 70) { interfaceCtx->bAlpha = 70; } @@ -1106,7 +1113,8 @@ void Interface_UpdateHudAlphas(PlayState* play, s16 dimmingAlpha) { interfaceCtx->aAlpha = risingAlpha; } - if ((gSaveContext.buttonStatus[EQUIP_SLOT_B] == BTN_DISABLED) || (gSaveContext.unk_1015 == ITEM_NONE)) { + if ((gSaveContext.buttonStatus[EQUIP_SLOT_B] == BTN_DISABLED) || + (gSaveContext.bButtonStatus == BTN_DISABLED)) { if (interfaceCtx->bAlpha != 70) { interfaceCtx->bAlpha = 70; } @@ -1485,453 +1493,442 @@ void Interface_UpdateHudAlphas(PlayState* play, s16 dimmingAlpha) { } } -void func_80110038(PlayState* play) { +void Interface_UpdateButtonsPart2(PlayState* play) { MessageContext* msgCtx = &play->msgCtx; InterfaceContext* interfaceCtx = &play->interfaceCtx; Player* player = GET_PLAYER(play); s16 i; - s16 phi_t3 = false; + s16 restoreHudVisibility = false; if (gSaveContext.eventInf[4] & 2) { - for (i = EQUIP_SLOT_C_LEFT; i <= EQUIP_SLOT_C_RIGHT; i++) { if ((GET_CUR_FORM_BTN_ITEM(i) != ITEM_PICTO_BOX) || (msgCtx->msgMode != 0)) { if (gSaveContext.buttonStatus[i] == BTN_ENABLED) { - phi_t3 = true; + restoreHudVisibility = true; } gSaveContext.buttonStatus[i] = BTN_DISABLED; } else { if (gSaveContext.buttonStatus[i] == BTN_DISABLED) { - phi_t3 = true; + restoreHudVisibility = true; } gSaveContext.buttonStatus[i] = BTN_ENABLED; } } - if (D_801BF884 == 0) { + if (sPictographState == PICTOGRAPH_STATE_OFF) { if (gSaveContext.buttonStatus[EQUIP_SLOT_B] != BTN_DISABLED) { - phi_t3 = true; + restoreHudVisibility = true; } gSaveContext.buttonStatus[EQUIP_SLOT_B] = BTN_DISABLED; } else { if (gSaveContext.buttonStatus[EQUIP_SLOT_B] == BTN_DISABLED) { - phi_t3 = true; + restoreHudVisibility = true; } gSaveContext.buttonStatus[EQUIP_SLOT_B] = BTN_ENABLED; } - } else { - if (gSaveContext.save.weekEventReg[90] & 0x20) { - for (i = EQUIP_SLOT_C_LEFT; i <= EQUIP_SLOT_C_RIGHT; i++) { - if (gSaveContext.buttonStatus[i] == BTN_ENABLED) { - gSaveContext.buttonStatus[i] = BTN_DISABLED; - } + } else if (gSaveContext.save.weekEventReg[90] & 0x20) { + for (i = EQUIP_SLOT_C_LEFT; i <= EQUIP_SLOT_C_RIGHT; i++) { + if (gSaveContext.buttonStatus[i] == BTN_ENABLED) { + gSaveContext.buttonStatus[i] = BTN_DISABLED; } + } - Interface_SetHudVisibility(HUD_VISIBILITY_B); - } 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) { - gSaveContext.buttonStatus[i] = BTN_DISABLED; - } + Interface_SetHudVisibility(HUD_VISIBILITY_B); + } 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) { + gSaveContext.buttonStatus[i] = BTN_DISABLED; } + } - 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++) { - if ((GET_CUR_FORM_BTN_ITEM(i) == ITEM_MASK_FIERCE_DEITY) || - ((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_BOTTLE) && (GET_CUR_FORM_BTN_ITEM(i) <= ITEM_OBABA_DRINK))) { - if (gSaveContext.buttonStatus[i] == BTN_DISABLED) { - phi_t3 = true; - gSaveContext.buttonStatus[i] = BTN_ENABLED; - } - } else { - if (gSaveContext.buttonStatus[i] != BTN_DISABLED) { - gSaveContext.buttonStatus[i] = BTN_DISABLED; - phi_t3 = true; - } + 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++) { + if ((GET_CUR_FORM_BTN_ITEM(i) == ITEM_MASK_FIERCE_DEITY) || + ((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_BOTTLE) && (GET_CUR_FORM_BTN_ITEM(i) <= ITEM_OBABA_DRINK))) { + if (gSaveContext.buttonStatus[i] == BTN_DISABLED) { + restoreHudVisibility = true; + gSaveContext.buttonStatus[i] = BTN_ENABLED; + } + } else { + if (gSaveContext.buttonStatus[i] != BTN_DISABLED) { + gSaveContext.buttonStatus[i] = BTN_DISABLED; + restoreHudVisibility = true; } } + } + } else { + for (i = EQUIP_SLOT_C_LEFT; i <= EQUIP_SLOT_C_RIGHT; i++) { + if ((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_MASK_DEKU) && (GET_CUR_FORM_BTN_ITEM(i) <= ITEM_MASK_ZORA)) { + if (gSaveContext.buttonStatus[i] != BTN_DISABLED) { + restoreHudVisibility = true; + } + gSaveContext.buttonStatus[i] = BTN_DISABLED; + } else { + if (gSaveContext.buttonStatus[i] == BTN_DISABLED) { + restoreHudVisibility = true; + } + gSaveContext.buttonStatus[i] = BTN_ENABLED; + } + } + } + } else if ((play->sceneNum == SCENE_SPOT00) && (gSaveContext.sceneSetupIndex == 6)) { + for (i = EQUIP_SLOT_C_LEFT; i <= EQUIP_SLOT_C_RIGHT; i++) { + if (gSaveContext.buttonStatus[i] == BTN_ENABLED) { + restoreHudVisibility = true; + } + gSaveContext.buttonStatus[i] = BTN_DISABLED; + } + } else if (gSaveContext.eventInf[3] & 0x10) { + 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); } else { - for (i = EQUIP_SLOT_C_LEFT; i <= EQUIP_SLOT_C_RIGHT; i++) { - if ((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_MASK_DEKU) && (GET_CUR_FORM_BTN_ITEM(i) <= ITEM_MASK_ZORA)) { - if (gSaveContext.buttonStatus[i] != BTN_DISABLED) { - phi_t3 = true; + gSaveContext.buttonStatus[EQUIP_SLOT_B] = BTN_DISABLED; + restoreHudVisibility = true; + } + } else { + if (gSaveContext.buttonStatus[EQUIP_SLOT_B] == BTN_DISABLED) { + gSaveContext.buttonStatus[EQUIP_SLOT_B] = BTN_ENABLED; + restoreHudVisibility = true; + } + + for (i = EQUIP_SLOT_C_LEFT; i <= EQUIP_SLOT_C_RIGHT; i++) { + if (gSaveContext.buttonStatus[i] == BTN_ENABLED) { + restoreHudVisibility = true; + } + gSaveContext.buttonStatus[i] = BTN_DISABLED; + } + } + + if (restoreHudVisibility || (gSaveContext.hudVisibility != HUD_VISIBILITY_A_B_MINIMAP)) { + gSaveContext.hudVisibility = HUD_VISIBILITY_IDLE; + Interface_SetHudVisibility(HUD_VISIBILITY_A_B_MINIMAP); + restoreHudVisibility = false; + } + } 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; + Interface_LoadItemIconImpl(play, EQUIP_SLOT_B); + gSaveContext.buttonStatus[EQUIP_SLOT_B] = BTN_ENABLED; + restoreHudVisibility = true; + } + } else if (gSaveContext.buttonStatus[EQUIP_SLOT_B] == BTN_ENABLED) { + gSaveContext.buttonStatus[EQUIP_SLOT_B] = BTN_DISABLED; + restoreHudVisibility = true; + } + + if (restoreHudVisibility) { + gSaveContext.buttonStatus[EQUIP_SLOT_C_LEFT] = BTN_DISABLED; + gSaveContext.buttonStatus[EQUIP_SLOT_C_DOWN] = BTN_DISABLED; + gSaveContext.buttonStatus[EQUIP_SLOT_C_RIGHT] = BTN_DISABLED; + } + } else if (!gSaveContext.save.playerData.isMagicAcquired && (CUR_FORM == PLAYER_FORM_DEKU) && + (BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) == ITEM_NUT)) { + BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) = ITEM_FD; + gSaveContext.buttonStatus[EQUIP_SLOT_B] = BTN_DISABLED; + } else 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->blastMaskTimer == 0)) { + if (gSaveContext.bButtonStatus == BTN_DISABLED) { + restoreHudVisibility = true; + } + gSaveContext.bButtonStatus = BTN_ENABLED; + } else if ((interfaceCtx->bButtonDoAction == DO_ACTION_EXPLODE) && + (player->currentMask == PLAYER_MASK_BLAST)) { + if (gSaveContext.bButtonStatus != BTN_DISABLED) { + gSaveContext.bButtonStatus = BTN_DISABLED; + restoreHudVisibility = true; + } + } else { + if (gSaveContext.buttonStatus[EQUIP_SLOT_B] != BTN_DISABLED) { + restoreHudVisibility = true; + } + gSaveContext.buttonStatus[EQUIP_SLOT_B] = BTN_DISABLED; + } + } else { + if (gSaveContext.buttonStatus[EQUIP_SLOT_B] == BTN_DISABLED) { + restoreHudVisibility = true; + } + gSaveContext.buttonStatus[EQUIP_SLOT_B] = BTN_ENABLED; + } + + for (i = EQUIP_SLOT_C_LEFT; i <= EQUIP_SLOT_C_RIGHT; i++) { + if (GET_CUR_FORM_BTN_ITEM(i) != ITEM_MASK_ZORA) { + 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) { + restoreHudVisibility = true; } gSaveContext.buttonStatus[i] = BTN_DISABLED; } else { if (gSaveContext.buttonStatus[i] == BTN_DISABLED) { - phi_t3 = true; + restoreHudVisibility = true; } gSaveContext.buttonStatus[i] = BTN_ENABLED; } - } - } - } else if ((play->sceneNum == SCENE_SPOT00) && (gSaveContext.sceneSetupIndex == 6)) { - for (i = EQUIP_SLOT_C_LEFT; i <= EQUIP_SLOT_C_RIGHT; i++) { - if (gSaveContext.buttonStatus[i] == BTN_ENABLED) { - phi_t3 = true; - } - gSaveContext.buttonStatus[i] = BTN_DISABLED; - } - } else if (gSaveContext.eventInf[3] & 0x10) { - 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); } else { - gSaveContext.buttonStatus[EQUIP_SLOT_B] = BTN_DISABLED; - phi_t3 = true; - } - } else { - if (gSaveContext.buttonStatus[EQUIP_SLOT_B] == BTN_DISABLED) { - gSaveContext.buttonStatus[EQUIP_SLOT_B] = BTN_ENABLED; - phi_t3 = true; - } - - for (i = EQUIP_SLOT_C_LEFT; i <= EQUIP_SLOT_C_RIGHT; i++) { if (gSaveContext.buttonStatus[i] == BTN_ENABLED) { - phi_t3 = true; + restoreHudVisibility = true; } gSaveContext.buttonStatus[i] = BTN_DISABLED; } + } else if (gSaveContext.buttonStatus[i] == BTN_DISABLED) { + gSaveContext.buttonStatus[i] = BTN_ENABLED; + restoreHudVisibility = true; } + } - 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; + if (restoreHudVisibility) { + gSaveContext.hudVisibility = HUD_VISIBILITY_IDLE; + } + + if ((play->transitionTrigger == TRANS_TRIGGER_OFF) && (play->transitionMode == TRANS_MODE_OFF)) { + if (ActorCutscene_GetCurrentIndex() == -1) { + Interface_SetHudVisibility(HUD_VISIBILITY_ALL); } - } 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; - Interface_LoadItemIconImpl(play, EQUIP_SLOT_B); - gSaveContext.buttonStatus[EQUIP_SLOT_B] = BTN_ENABLED; - phi_t3 = true; + } + } else 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) { + restoreHudVisibility = true; } - } else if (gSaveContext.buttonStatus[EQUIP_SLOT_B] == BTN_ENABLED) { - gSaveContext.buttonStatus[EQUIP_SLOT_B] = BTN_DISABLED; - phi_t3 = true; + gSaveContext.buttonStatus[i] = BTN_DISABLED; + } else { + if (gSaveContext.buttonStatus[i] == BTN_DISABLED) { + restoreHudVisibility = true; + } + gSaveContext.buttonStatus[i] = BTN_ENABLED; + } + } + + if (gSaveContext.buttonStatus[EQUIP_SLOT_B] != BTN_DISABLED) { + gSaveContext.buttonStatus[EQUIP_SLOT_B] = BTN_DISABLED; + restoreHudVisibility = true; + } + } 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; + gSaveContext.buttonStatus[EQUIP_SLOT_C_DOWN] = BTN_DISABLED; + gSaveContext.buttonStatus[EQUIP_SLOT_C_RIGHT] = BTN_DISABLED; + restoreHudVisibility = true; + Interface_SetHudVisibility(HUD_VISIBILITY_ALL); + } + } else { + if ((interfaceCtx->bButtonDoAction == DO_ACTION_EXPLODE) && (player->currentMask == PLAYER_MASK_BLAST) && + (player->blastMaskTimer != 0)) { + if (gSaveContext.bButtonStatus != BTN_DISABLED) { + gSaveContext.bButtonStatus = BTN_DISABLED; + restoreHudVisibility = true; + } + } else { + if (gSaveContext.bButtonStatus == BTN_DISABLED) { + gSaveContext.bButtonStatus = BTN_ENABLED; + restoreHudVisibility = true; } - if (phi_t3) { - gSaveContext.buttonStatus[EQUIP_SLOT_C_LEFT] = BTN_DISABLED; - gSaveContext.buttonStatus[EQUIP_SLOT_C_DOWN] = BTN_DISABLED; - gSaveContext.buttonStatus[EQUIP_SLOT_C_RIGHT] = BTN_DISABLED; - } - } else if (!gSaveContext.save.playerData.isMagicAcquired && (CUR_FORM == PLAYER_FORM_DEKU) && - (BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) == ITEM_NUT)) { - BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) = ITEM_FD; - gSaveContext.buttonStatus[EQUIP_SLOT_B] = BTN_DISABLED; - } else { - 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) { - phi_t3 = true; - } - gSaveContext.unk_1015 = 0; - } else if ((interfaceCtx->bButtonDoAction == DO_ACTION_EXPLODE) && - (player->currentMask == PLAYER_MASK_BLAST)) { - if (gSaveContext.unk_1015 != 0xFF) { - gSaveContext.unk_1015 = 0xFF; - phi_t3 = true; + if (interfaceCtx->restrictions.bButton == 0) { + 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)) { + if (GET_CUR_EQUIP_VALUE(EQUIP_TYPE_SWORD) == EQUIP_VALUE_SWORD_NONE) { + gSaveContext.buttonStatus[EQUIP_SLOT_B] = BTN_DISABLED; + } + + if (gSaveContext.buttonStatus[EQUIP_SLOT_B] == BTN_ENABLED) { + gSaveContext.buttonStatus[EQUIP_SLOT_B] = + ITEM_SWORD_KOKIRI + GET_CUR_EQUIP_VALUE(EQUIP_TYPE_SWORD) - EQUIP_VALUE_SWORD_KOKIRI; + } + + BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) = gSaveContext.buttonStatus[EQUIP_SLOT_B]; + + if (BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) != ITEM_NONE) { + Interface_LoadItemIconImpl(play, EQUIP_SLOT_B); + } + restoreHudVisibility = true; + } else if (BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) == ITEM_NONE) { + if (interfaceCtx->bButtonDoAction != 0) { + if (gSaveContext.buttonStatus[EQUIP_SLOT_B] == BTN_DISABLED) { + restoreHudVisibility = true; + gSaveContext.buttonStatus[EQUIP_SLOT_B] = BTN_ENABLED; } } else { if (gSaveContext.buttonStatus[EQUIP_SLOT_B] != BTN_DISABLED) { - phi_t3 = true; + restoreHudVisibility = true; + gSaveContext.buttonStatus[EQUIP_SLOT_B] = BTN_DISABLED; } + } + } else if (BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) == ITEM_NONE) { + if (gSaveContext.buttonStatus[EQUIP_SLOT_B] != BTN_DISABLED) { + restoreHudVisibility = true; gSaveContext.buttonStatus[EQUIP_SLOT_B] = BTN_DISABLED; } } else { if (gSaveContext.buttonStatus[EQUIP_SLOT_B] == BTN_DISABLED) { - phi_t3 = true; + restoreHudVisibility = true; + gSaveContext.buttonStatus[EQUIP_SLOT_B] = BTN_ENABLED; } - gSaveContext.buttonStatus[EQUIP_SLOT_B] = BTN_ENABLED; } + } else if (interfaceCtx->restrictions.bButton != 0) { + 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)) { + if (GET_CUR_EQUIP_VALUE(EQUIP_TYPE_SWORD) == EQUIP_VALUE_SWORD_NONE) { + gSaveContext.buttonStatus[EQUIP_SLOT_B] = BTN_DISABLED; + } - for (i = EQUIP_SLOT_C_LEFT; i <= EQUIP_SLOT_C_RIGHT; i++) { - if (GET_CUR_FORM_BTN_ITEM(i) != ITEM_MASK_ZORA) { - 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; - } - gSaveContext.buttonStatus[i] = BTN_DISABLED; - } else { - if (gSaveContext.buttonStatus[i] == BTN_DISABLED) { - phi_t3 = true; - } - gSaveContext.buttonStatus[i] = BTN_ENABLED; - } - } else { + BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) = gSaveContext.buttonStatus[EQUIP_SLOT_B]; + + if (BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) != ITEM_NONE) { + Interface_LoadItemIconImpl(play, EQUIP_SLOT_B); + } + restoreHudVisibility = true; + } + if (gSaveContext.buttonStatus[EQUIP_SLOT_B] != BTN_DISABLED) { + gSaveContext.buttonStatus[EQUIP_SLOT_B] = BTN_DISABLED; + restoreHudVisibility = true; + } + } + } + + if (gSaveContext.save.playerForm == player->transformation) { + for (i = EQUIP_SLOT_C_LEFT; i <= EQUIP_SLOT_C_RIGHT; i++) { + if (!D_801C2410[(void)0, gSaveContext.save.playerForm][GET_CUR_FORM_BTN_ITEM(i)]) { + if (gSaveContext.buttonStatus[i] != BTN_DISABLED) { + gSaveContext.buttonStatus[i] = BTN_DISABLED; + restoreHudVisibility = true; + } + } else if (player->actor.id != ACTOR_PLAYER) { + if (gSaveContext.buttonStatus[i] != BTN_DISABLED) { + gSaveContext.buttonStatus[i] = BTN_DISABLED; + restoreHudVisibility = true; + } + } else if (player->currentMask == PLAYER_MASK_GIANT) { + if (GET_CUR_FORM_BTN_ITEM(i) != ITEM_MASK_GIANT) { + if (gSaveContext.buttonStatus[i] != BTN_DISABLED) { + gSaveContext.buttonStatus[i] = BTN_DISABLED; + restoreHudVisibility = true; + } + } else if (gSaveContext.buttonStatus[i] == BTN_DISABLED) { + restoreHudVisibility = true; + gSaveContext.buttonStatus[i] = BTN_ENABLED; + } + } else if (GET_CUR_FORM_BTN_ITEM(i) == ITEM_MASK_GIANT) { + if (play->sceneNum != SCENE_INISIE_BS) { + if (gSaveContext.buttonStatus[i] != BTN_DISABLED) { + gSaveContext.buttonStatus[i] = BTN_DISABLED; + restoreHudVisibility = true; + } + } else if (gSaveContext.buttonStatus[i] == BTN_DISABLED) { + restoreHudVisibility = true; + gSaveContext.buttonStatus[i] = BTN_ENABLED; + } + } else if (GET_CUR_FORM_BTN_ITEM(i) == ITEM_MASK_FIERCE_DEITY) { + if ((play->sceneNum != SCENE_MITURIN_BS) && (play->sceneNum != SCENE_HAKUGIN_BS) && + (play->sceneNum != SCENE_SEA_BS) && (play->sceneNum != SCENE_INISIE_BS) && + (play->sceneNum != SCENE_LAST_BS)) { + if (gSaveContext.buttonStatus[i] != BTN_DISABLED) { + gSaveContext.buttonStatus[i] = BTN_DISABLED; + restoreHudVisibility = true; + } + } else if (gSaveContext.buttonStatus[i] == BTN_DISABLED) { + restoreHudVisibility = true; + gSaveContext.buttonStatus[i] = BTN_ENABLED; + } + } else { + if (interfaceCtx->restrictions.tradeItems != 0) { + if (((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_MOON_TEAR) && + (GET_CUR_FORM_BTN_ITEM(i) <= ITEM_PENDANT_OF_MEMORIES)) || + ((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_BOTTLE) && + (GET_CUR_FORM_BTN_ITEM(i) <= ITEM_OBABA_DRINK)) || + (GET_CUR_FORM_BTN_ITEM(i) == ITEM_OCARINA)) { if (gSaveContext.buttonStatus[i] == BTN_ENABLED) { - phi_t3 = true; + restoreHudVisibility = true; } gSaveContext.buttonStatus[i] = BTN_DISABLED; } - } else if (gSaveContext.buttonStatus[i] == BTN_DISABLED) { - gSaveContext.buttonStatus[i] = BTN_ENABLED; - phi_t3 = true; - } - } - - if (phi_t3) { - gSaveContext.hudVisibility = HUD_VISIBILITY_IDLE; - } - - if ((play->transitionTrigger == TRANS_TRIGGER_OFF) && (play->transitionMode == TRANS_MODE_OFF)) { - if (ActorCutscene_GetCurrentIndex() == -1) { - Interface_SetHudVisibility(HUD_VISIBILITY_ALL); - } - } - } else { - 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) { - phi_t3 = true; - } - gSaveContext.buttonStatus[i] = BTN_DISABLED; - } else { + } else if (interfaceCtx->restrictions.tradeItems == 0) { + if (((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_MOON_TEAR) && + (GET_CUR_FORM_BTN_ITEM(i) <= ITEM_PENDANT_OF_MEMORIES)) || + ((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_BOTTLE) && + (GET_CUR_FORM_BTN_ITEM(i) <= ITEM_OBABA_DRINK)) || + (GET_CUR_FORM_BTN_ITEM(i) == ITEM_OCARINA)) { if (gSaveContext.buttonStatus[i] == BTN_DISABLED) { - phi_t3 = true; + restoreHudVisibility = true; } gSaveContext.buttonStatus[i] = BTN_ENABLED; } } - if (gSaveContext.buttonStatus[EQUIP_SLOT_B] != BTN_DISABLED) { - gSaveContext.buttonStatus[EQUIP_SLOT_B] = BTN_DISABLED; - phi_t3 = true; - } - } 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; - gSaveContext.buttonStatus[EQUIP_SLOT_C_DOWN] = BTN_DISABLED; - gSaveContext.buttonStatus[EQUIP_SLOT_C_RIGHT] = BTN_DISABLED; - phi_t3 = true; - Interface_SetHudVisibility(HUD_VISIBILITY_ALL); - } - } else { - if ((interfaceCtx->bButtonDoAction == DO_ACTION_EXPLODE) && - (player->currentMask == PLAYER_MASK_BLAST) && (player->unk_B60 != 0)) { - if (gSaveContext.unk_1015 != 0xFF) { - gSaveContext.unk_1015 = 0xFF; - phi_t3 = true; + if (interfaceCtx->restrictions.unk_317 != 0) { + if ((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_MASK_DEKU) && + (GET_CUR_FORM_BTN_ITEM(i) <= ITEM_MASK_GIANT)) { + if (!gSaveContext.buttonStatus[i]) { // == BTN_ENABLED + restoreHudVisibility = true; + } + gSaveContext.buttonStatus[i] = BTN_DISABLED; } - } else { - if (gSaveContext.unk_1015 == 0xFF) { - gSaveContext.unk_1015 = 0; - phi_t3 = true; - } - - if (interfaceCtx->restrictions.bButton == 0) { - 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)) { - if (GET_CUR_EQUIP_VALUE(EQUIP_TYPE_SWORD) == EQUIP_VALUE_SWORD_NONE) { - gSaveContext.buttonStatus[EQUIP_SLOT_B] = BTN_DISABLED; - } - - if (gSaveContext.buttonStatus[EQUIP_SLOT_B] == BTN_ENABLED) { - gSaveContext.buttonStatus[EQUIP_SLOT_B] = ITEM_SWORD_KOKIRI + - GET_CUR_EQUIP_VALUE(EQUIP_TYPE_SWORD) - - EQUIP_VALUE_SWORD_KOKIRI; - } - - BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) = gSaveContext.buttonStatus[EQUIP_SLOT_B]; - - if (BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) != ITEM_NONE) { - Interface_LoadItemIconImpl(play, EQUIP_SLOT_B); - } - phi_t3 = true; - } else if (BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) == ITEM_NONE) { - if (interfaceCtx->bButtonDoAction != 0) { - if (gSaveContext.buttonStatus[EQUIP_SLOT_B] == BTN_DISABLED) { - phi_t3 = true; - gSaveContext.buttonStatus[EQUIP_SLOT_B] = BTN_ENABLED; - } - } else { - if (gSaveContext.buttonStatus[EQUIP_SLOT_B] != BTN_DISABLED) { - phi_t3 = true; - gSaveContext.buttonStatus[EQUIP_SLOT_B] = BTN_DISABLED; - } - } - } else { - if (BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) == ITEM_NONE) { - if (gSaveContext.buttonStatus[EQUIP_SLOT_B] != BTN_DISABLED) { - phi_t3 = true; - gSaveContext.buttonStatus[EQUIP_SLOT_B] = BTN_DISABLED; - } - } else { - if (gSaveContext.buttonStatus[EQUIP_SLOT_B] == BTN_DISABLED) { - phi_t3 = true; - gSaveContext.buttonStatus[EQUIP_SLOT_B] = BTN_ENABLED; - } - } - } - } else if (interfaceCtx->restrictions.bButton != 0) { - 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)) { - if (GET_CUR_EQUIP_VALUE(EQUIP_TYPE_SWORD) == EQUIP_VALUE_SWORD_NONE) { - gSaveContext.buttonStatus[EQUIP_SLOT_B] = BTN_DISABLED; - } - - BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) = gSaveContext.buttonStatus[EQUIP_SLOT_B]; - - if (BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) != ITEM_NONE) { - Interface_LoadItemIconImpl(play, EQUIP_SLOT_B); - } - phi_t3 = true; - } - if (gSaveContext.buttonStatus[EQUIP_SLOT_B] != BTN_DISABLED) { - gSaveContext.buttonStatus[EQUIP_SLOT_B] = BTN_DISABLED; - phi_t3 = true; + } else if (interfaceCtx->restrictions.unk_317 == 0) { + if ((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_MASK_DEKU) && + (GET_CUR_FORM_BTN_ITEM(i) <= ITEM_MASK_GIANT)) { + if (gSaveContext.buttonStatus[i] == BTN_DISABLED) { + restoreHudVisibility = true; } + gSaveContext.buttonStatus[i] = BTN_ENABLED; } } - if (gSaveContext.save.playerForm == player->transformation) { - for (i = EQUIP_SLOT_C_LEFT; i <= EQUIP_SLOT_C_RIGHT; i++) { - if (!D_801C2410[(void)0, gSaveContext.save.playerForm][GET_CUR_FORM_BTN_ITEM(i)]) { - if (gSaveContext.buttonStatus[i] != BTN_DISABLED) { - gSaveContext.buttonStatus[i] = BTN_DISABLED; - phi_t3 = true; - } - } else if (player->actor.id != 0) { - if (gSaveContext.buttonStatus[i] != BTN_DISABLED) { - gSaveContext.buttonStatus[i] = BTN_DISABLED; - phi_t3 = true; - } - } else if (player->currentMask == PLAYER_MASK_GIANT) { + if (interfaceCtx->restrictions.pictographBox != 0) { + if (GET_CUR_FORM_BTN_ITEM(i) == ITEM_PICTO_BOX) { + if (!gSaveContext.buttonStatus[i]) { // == BTN_ENABLED + restoreHudVisibility = true; + } + gSaveContext.buttonStatus[i] = BTN_DISABLED; + } + } else if (interfaceCtx->restrictions.pictographBox == 0) { + if (GET_CUR_FORM_BTN_ITEM(i) == ITEM_PICTO_BOX) { + if (gSaveContext.buttonStatus[i] == BTN_DISABLED) { + restoreHudVisibility = true; + } + gSaveContext.buttonStatus[i] = BTN_ENABLED; + } + } - if (GET_CUR_FORM_BTN_ITEM(i) != ITEM_MASK_GIANT) { - if (gSaveContext.buttonStatus[i] != BTN_DISABLED) { - gSaveContext.buttonStatus[i] = BTN_DISABLED; - phi_t3 = true; - } - } else if (gSaveContext.buttonStatus[i] == BTN_DISABLED) { - phi_t3 = true; - gSaveContext.buttonStatus[i] = BTN_ENABLED; - } - } else if (GET_CUR_FORM_BTN_ITEM(i) == ITEM_MASK_GIANT) { - if (play->sceneNum != SCENE_INISIE_BS) { - if (gSaveContext.buttonStatus[i] != BTN_DISABLED) { - gSaveContext.buttonStatus[i] = BTN_DISABLED; - phi_t3 = true; - } - } else if (gSaveContext.buttonStatus[i] == BTN_DISABLED) { - phi_t3 = true; - gSaveContext.buttonStatus[i] = BTN_ENABLED; - } - } else if (GET_CUR_FORM_BTN_ITEM(i) == ITEM_MASK_FIERCE_DEITY) { - if ((play->sceneNum != SCENE_MITURIN_BS) && (play->sceneNum != SCENE_HAKUGIN_BS) && - (play->sceneNum != SCENE_SEA_BS) && (play->sceneNum != SCENE_INISIE_BS) && - (play->sceneNum != SCENE_LAST_BS)) { - if (gSaveContext.buttonStatus[i] != BTN_DISABLED) { - gSaveContext.buttonStatus[i] = BTN_DISABLED; - phi_t3 = true; - } - } else if (gSaveContext.buttonStatus[i] == BTN_DISABLED) { - phi_t3 = true; - gSaveContext.buttonStatus[i] = BTN_ENABLED; - } - } else { - if (interfaceCtx->restrictions.tradeItems != 0) { - if (((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_MOON_TEAR) && - (GET_CUR_FORM_BTN_ITEM(i) <= ITEM_PENDANT_OF_MEMORIES)) || - ((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_BOTTLE) && - (GET_CUR_FORM_BTN_ITEM(i) <= ITEM_OBABA_DRINK)) || - (GET_CUR_FORM_BTN_ITEM(i) == ITEM_OCARINA)) { - if (gSaveContext.buttonStatus[i] == BTN_ENABLED) { - phi_t3 = true; - } - gSaveContext.buttonStatus[i] = BTN_DISABLED; - } - } else if (interfaceCtx->restrictions.tradeItems == 0) { - if (((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_MOON_TEAR) && - (GET_CUR_FORM_BTN_ITEM(i) <= ITEM_PENDANT_OF_MEMORIES)) || - ((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_BOTTLE) && - (GET_CUR_FORM_BTN_ITEM(i) <= ITEM_OBABA_DRINK)) || - (GET_CUR_FORM_BTN_ITEM(i) == ITEM_OCARINA)) { - if (gSaveContext.buttonStatus[i] == BTN_DISABLED) { - phi_t3 = true; - } - gSaveContext.buttonStatus[i] = BTN_ENABLED; - } - } + if (interfaceCtx->restrictions.all != 0) { + if (!((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_MOON_TEAR) && + (GET_CUR_FORM_BTN_ITEM(i) <= ITEM_PENDANT_OF_MEMORIES)) && + !((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_BOTTLE) && + (GET_CUR_FORM_BTN_ITEM(i) <= ITEM_OBABA_DRINK)) && + (GET_CUR_FORM_BTN_ITEM(i) != ITEM_OCARINA) && + !((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_MASK_DEKU) && + (GET_CUR_FORM_BTN_ITEM(i) <= ITEM_MASK_GIANT)) && + (GET_CUR_FORM_BTN_ITEM(i) != ITEM_PICTO_BOX)) { - if (interfaceCtx->restrictions.unk_317 != 0) { - if ((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_MASK_DEKU) && - (GET_CUR_FORM_BTN_ITEM(i) <= ITEM_MASK_GIANT)) { - if (!gSaveContext.buttonStatus[i]) { // == BTN_ENABLED - phi_t3 = true; - } - gSaveContext.buttonStatus[i] = BTN_DISABLED; - } - } else if (interfaceCtx->restrictions.unk_317 == 0) { - if ((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_MASK_DEKU) && - (GET_CUR_FORM_BTN_ITEM(i) <= ITEM_MASK_GIANT)) { - if (gSaveContext.buttonStatus[i] == BTN_DISABLED) { - phi_t3 = true; - } - gSaveContext.buttonStatus[i] = BTN_ENABLED; - } - } + if ((gSaveContext.buttonStatus[i] == BTN_ENABLED)) { + restoreHudVisibility = true; + gSaveContext.buttonStatus[i] = BTN_DISABLED; + } + } + } else if (interfaceCtx->restrictions.all == 0) { + if (!((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_MOON_TEAR) && + (GET_CUR_FORM_BTN_ITEM(i) <= ITEM_PENDANT_OF_MEMORIES)) && + !((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_BOTTLE) && + (GET_CUR_FORM_BTN_ITEM(i) <= ITEM_OBABA_DRINK)) && + (GET_CUR_FORM_BTN_ITEM(i) != ITEM_OCARINA) && + !((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_MASK_DEKU) && + (GET_CUR_FORM_BTN_ITEM(i) <= ITEM_MASK_GIANT)) && + (GET_CUR_FORM_BTN_ITEM(i) != ITEM_PICTO_BOX)) { - if (interfaceCtx->restrictions.pictographBox != 0) { - if (GET_CUR_FORM_BTN_ITEM(i) == ITEM_PICTO_BOX) { - if (!gSaveContext.buttonStatus[i]) { // == BTN_ENABLED - phi_t3 = true; - } - gSaveContext.buttonStatus[i] = BTN_DISABLED; - } - } else if (interfaceCtx->restrictions.pictographBox == 0) { - if (GET_CUR_FORM_BTN_ITEM(i) == ITEM_PICTO_BOX) { - if (gSaveContext.buttonStatus[i] == BTN_DISABLED) { - phi_t3 = true; - } - gSaveContext.buttonStatus[i] = BTN_ENABLED; - } - } - - if (interfaceCtx->restrictions.all != 0) { - if (!((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_MOON_TEAR) && - (GET_CUR_FORM_BTN_ITEM(i) <= ITEM_PENDANT_OF_MEMORIES)) && - !((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_BOTTLE) && - (GET_CUR_FORM_BTN_ITEM(i) <= ITEM_OBABA_DRINK)) && - (GET_CUR_FORM_BTN_ITEM(i) != ITEM_OCARINA) && - !((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_MASK_DEKU) && - (GET_CUR_FORM_BTN_ITEM(i) <= ITEM_MASK_GIANT)) && - (GET_CUR_FORM_BTN_ITEM(i) != ITEM_PICTO_BOX)) { - - if ((gSaveContext.buttonStatus[i] == BTN_ENABLED)) { - phi_t3 = true; - gSaveContext.buttonStatus[i] = BTN_DISABLED; - } - } - } else if (interfaceCtx->restrictions.all == 0) { - if (!((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_MOON_TEAR) && - (GET_CUR_FORM_BTN_ITEM(i) <= ITEM_PENDANT_OF_MEMORIES)) && - !((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_BOTTLE) && - (GET_CUR_FORM_BTN_ITEM(i) <= ITEM_OBABA_DRINK)) && - (GET_CUR_FORM_BTN_ITEM(i) != ITEM_OCARINA) && - !((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_MASK_DEKU) && - (GET_CUR_FORM_BTN_ITEM(i) <= ITEM_MASK_GIANT)) && - (GET_CUR_FORM_BTN_ITEM(i) != ITEM_PICTO_BOX)) { - - if ((gSaveContext.buttonStatus[i] == BTN_DISABLED)) { - phi_t3 = true; - gSaveContext.buttonStatus[i] = BTN_ENABLED; - } - } - } + if ((gSaveContext.buttonStatus[i] == BTN_DISABLED)) { + restoreHudVisibility = true; + gSaveContext.buttonStatus[i] = BTN_ENABLED; } } } @@ -1940,28 +1937,28 @@ void func_80110038(PlayState* play) { } } - if (phi_t3 && (play->activeCamId == CAM_ID_MAIN) && (play->transitionTrigger == TRANS_TRIGGER_OFF) && + if (restoreHudVisibility && (play->activeCamId == CAM_ID_MAIN) && (play->transitionTrigger == TRANS_TRIGGER_OFF) && (play->transitionMode == TRANS_MODE_OFF)) { gSaveContext.hudVisibility = HUD_VISIBILITY_IDLE; Interface_SetHudVisibility(HUD_VISIBILITY_ALL); } } -void func_80111CB4(PlayState* play) { +void Interface_UpdateButtonsPart1(PlayState* play) { InterfaceContext* interfaceCtx = &play->interfaceCtx; Player* player = GET_PLAYER(play); s32 pad; - s32 sp28; + s32 restoreHudVisibility = false; - sp28 = false; if (gSaveContext.save.cutscene < 0xFFF0) { gSaveContext.hudVisibilityForceButtonAlphasByStatus = false; if ((player->stateFlags1 & PLAYER_STATE1_800000) || (gSaveContext.save.weekEventReg[8] & 1) || (!(gSaveContext.eventInf[4] & 2) && (play->unk_1887C >= 2))) { + // Update specific minigames? if ((player->stateFlags1 & PLAYER_STATE1_800000) && (player->currentMask == PLAYER_MASK_BLAST) && - (gSaveContext.unk_1015 == 0xFF)) { - sp28 = true; - gSaveContext.unk_1015 = 0; + (gSaveContext.bButtonStatus == BTN_DISABLED)) { + restoreHudVisibility = true; + gSaveContext.bButtonStatus = BTN_ENABLED; } if (BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) != ITEM_NONE) { @@ -2075,7 +2072,7 @@ void func_80111CB4(PlayState* play) { if (gSaveContext.buttonStatus[EQUIP_SLOT_B] == BTN_DISABLED) { gSaveContext.buttonStatus[EQUIP_SLOT_B] = BTN_ENABLED; - sp28 = true; + restoreHudVisibility = true; } gSaveContext.buttonStatus[EQUIP_SLOT_C_LEFT] = BTN_DISABLED; @@ -2102,86 +2099,93 @@ void func_80111CB4(PlayState* play) { Interface_SetHudVisibility(HUD_VISIBILITY_A_B_MINIMAP); } } - } else if (D_801BF884 != 0) { - if (D_801BF884 == 1) { - if (!(play->actorCtx.flags & ACTORCTX_FLAG_2)) { + } else if (sPictographState != PICTOGRAPH_STATE_OFF) { + // Update pictograph + if (sPictographState == PICTOGRAPH_STATE_LENS) { + if (!(play->actorCtx.flags & ACTORCTX_FLAG_PICTOGRAPH_ON)) { func_801663C4((play->unk_18E5C != NULL) ? play->unk_18E5C : D_801FBB90, (u8*)((void)0, gSaveContext.pictoPhoto), 0x4600); interfaceCtx->unk_224 = 0; interfaceCtx->unk_222 = interfaceCtx->unk_224; - sp28 = true; - D_801BF884 = 0; + restoreHudVisibility = true; + sPictographState = PICTOGRAPH_STATE_OFF; } else if (CHECK_BTN_ALL(CONTROLLER1(&play->state)->press.button, BTN_B)) { - play->actorCtx.flags &= ~ACTORCTX_FLAG_2; + play->actorCtx.flags &= ~ACTORCTX_FLAG_PICTOGRAPH_ON; interfaceCtx->unk_224 = 0; interfaceCtx->unk_222 = interfaceCtx->unk_224; - sp28 = true; - D_801BF884 = 0; + restoreHudVisibility = true; + sPictographState = PICTOGRAPH_STATE_OFF; } else if (CHECK_BTN_ALL(CONTROLLER1(&play->state)->press.button, BTN_A) || (func_801A5100() == 1)) { if (!(gSaveContext.eventInf[4] & 2) || ((gSaveContext.eventInf[4] & 2) && (ActorCutscene_GetCurrentIndex() == -1))) { play_sound(NA_SE_SY_CAMERA_SHUTTER); SREG(89) = 1; - play->unk_18845 = 1; - D_801BF884 = 2; - D_801BF888 = true; + play->haltAllActors = true; + sPictographState = PICTOGRAPH_STATE_SETUP_PHOTO; + sPictographPhotoBeingTaken = true; } } - } else if ((D_801BF884 >= 2) && (Message_GetState(&play->msgCtx) == 4) && Message_ShouldAdvance(play)) { - play->unk_18845 = 0; + } else if ((sPictographState >= PICTOGRAPH_STATE_SETUP_PHOTO) && (Message_GetState(&play->msgCtx) == 4) && + Message_ShouldAdvance(play)) { + play->haltAllActors = false; player->stateFlags1 &= ~PLAYER_STATE1_200; func_801477B4(play); if (play->msgCtx.choiceIndex != 0) { func_8019F230(); func_80115844(play, 0x12); Interface_SetHudVisibility(HUD_VISIBILITY_A_B); - D_801BF884 = 1; + sPictographState = PICTOGRAPH_STATE_LENS; REMOVE_QUEST_ITEM(QUEST_PICTOGRAPH); } else { func_8019F208(); interfaceCtx->unk_222 = interfaceCtx->unk_224 = 0; - sp28 = true; + restoreHudVisibility = true; Interface_SetHudVisibility(HUD_VISIBILITY_ALL); - D_801BF884 = 0; - if (D_801BF888) { + sPictographState = PICTOGRAPH_STATE_OFF; + if (sPictographPhotoBeingTaken) { func_801663C4((play->unk_18E5C != NULL) ? play->unk_18E5C : D_801FBB90, (u8*)((void)0, gSaveContext.pictoPhoto), 0x4600); Snap_RecordPictographedActors(play); } - play->actorCtx.flags &= ~ACTORCTX_FLAG_2; + play->actorCtx.flags &= ~ACTORCTX_FLAG_PICTOGRAPH_ON; SET_QUEST_ITEM(QUEST_PICTOGRAPH); - D_801BF888 = false; + sPictographPhotoBeingTaken = false; } } } else if ((gSaveContext.minigameStatus == MINIGAME_STATUS_ACTIVE) && (gSaveContext.save.entrance == ENTRANCE(WATERFALL_RAPIDS, 1)) && (play->transitionTrigger == TRANS_TRIGGER_OFF) && (play->transitionMode == TRANS_MODE_OFF)) { + // Update beaver race minigame 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_SetHudVisibility(HUD_VISIBILITY_A_B_MINIMAP); } else if ((gSaveContext.save.entrance == ENTRANCE(GORON_RACETRACK, 1)) && (play->transitionTrigger == TRANS_TRIGGER_OFF) && (play->transitionMode == TRANS_MODE_OFF)) { + // Update goron race minigame 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_SetHudVisibility(HUD_VISIBILITY_A_B_HEARTS_MAGIC_MINIMAP); - } else if (play->actorCtx.flags & ACTORCTX_FLAG_2) { + } else if (play->actorCtx.flags & ACTORCTX_FLAG_PICTOGRAPH_ON) { + // Update pictograph if (!CHECK_QUEST_ITEM(QUEST_PICTOGRAPH)) { func_80115844(play, 0x12); Interface_SetHudVisibility(HUD_VISIBILITY_A_B); - D_801BF884 = 1; + sPictographState = PICTOGRAPH_STATE_LENS; } else { func_80166644((u8*)((void)0, gSaveContext.pictoPhoto), (play->unk_18E5C != NULL) ? play->unk_18E5C : D_801FBB90, 0x4600); - play->unk_18845 = 1; - D_801BF884 = 2; + play->haltAllActors = true; + sPictographState = PICTOGRAPH_STATE_SETUP_PHOTO; } } else { - func_80110038(play); + // Update remaining cases + Interface_UpdateButtonsPart2(play); } } - if (sp28) { + + if (restoreHudVisibility) { gSaveContext.hudVisibility = HUD_VISIBILITY_IDLE; if ((play->transitionTrigger == TRANS_TRIGGER_OFF) && (play->transitionMode == TRANS_MODE_OFF)) { Interface_SetHudVisibility(HUD_VISIBILITY_ALL); @@ -2269,7 +2273,7 @@ void func_80112C0C(PlayState* play, u16 flag) { } 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; - func_80111CB4(play); + Interface_UpdateButtonsPart1(play); } } @@ -3771,7 +3775,7 @@ void Interface_DrawItemButtons(PlayState* play) { } if (interfaceCtx->tatlCalling && (play->pauseCtx.state == 0) && (play->pauseCtx.debugEditor == DEBUG_EDITOR_NONE) && - (play->csCtx.state == 0) && (D_801BF884 == 0)) { + (play->csCtx.state == 0) && (sPictographState == PICTOGRAPH_STATE_OFF)) { if (sCUpInvisible == 0) { // C-Up Button Texture, Color & Label (Tatl Text) gDPPipeSync(OVERLAY_DISP++); @@ -6250,8 +6254,8 @@ void Interface_Draw(PlayState* play) { Interface_DrawTimers(play); } - // PictoBox - if (D_801BF884 == 1) { + // Draw pictograph focus icons + if (sPictographState == PICTOGRAPH_STATE_LENS) { func_8012C654(play->state.gfxCtx); @@ -6285,22 +6289,22 @@ void Interface_Draw(PlayState* play) { if (1) {} } - if (D_801BF884 >= 2) { - if (!(play->actorCtx.flags & ACTORCTX_FLAG_2)) { + // Draw pictograph photo + if (sPictographState >= PICTOGRAPH_STATE_SETUP_PHOTO) { + if (!(play->actorCtx.flags & ACTORCTX_FLAG_PICTOGRAPH_ON)) { func_801663C4((play->unk_18E5C != NULL) ? play->unk_18E5C : D_801FBB90, (u8*)gSaveContext.pictoPhoto, 0x4600); interfaceCtx->unk_222 = interfaceCtx->unk_224 = 0; - D_801BF884 = 0; + sPictographState = PICTOGRAPH_STATE_OFF; gSaveContext.hudVisibility = HUD_VISIBILITY_IDLE; Interface_SetHudVisibility(HUD_VISIBILITY_ALL); - } else { s16 phi_a2; - if (D_801BF884 == 2) { - D_801BF884 = 3; + if (sPictographState == PICTOGRAPH_STATE_SETUP_PHOTO) { + sPictographState = PICTOGRAPH_STATE_PHOTO; Message_StartTextbox(play, 0xF8, NULL); Interface_SetHudVisibility(HUD_VISIBILITY_NONE); player->stateFlags1 |= PLAYER_STATE1_200; @@ -6331,6 +6335,7 @@ void Interface_Draw(PlayState* play) { } } + // Draw over the entire screen (used in gameover) if (interfaceCtx->screenFillAlpha != 0) { gDPPipeSync(OVERLAY_DISP++); gSPDisplayList(OVERLAY_DISP++, gScreenFillSetupDL); @@ -6354,12 +6359,14 @@ void Interface_LoadStory(PlayState* play, s32 block) { interfaceCtx->storySize, 0, &interfaceCtx->storyMsgQueue, NULL); interfaceCtx->storyState = 1; // fallthrough - case 1: if (osRecvMesg(&interfaceCtx->storyMsgQueue, NULL, block) == 0) { interfaceCtx->storyState = 2; } break; + + default: + break; } } @@ -6388,7 +6395,7 @@ void Interface_Update(PlayState* play) { if ((play->pauseCtx.state == 0) && (play->pauseCtx.debugEditor == DEBUG_EDITOR_NONE)) { if (play->gameOverCtx.state == GAMEOVER_INACTIVE) { - func_80111CB4(play); + Interface_UpdateButtonsPart1(play); } } @@ -6931,8 +6938,8 @@ void Interface_Init(PlayState* play) { } } - D_801BF884 = 0; - D_801BF888 = false; + sPictographState = PICTOGRAPH_STATE_OFF; + sPictographPhotoBeingTaken = false; if ((play->sceneNum != SCENE_MITURIN_BS) && (play->sceneNum != SCENE_HAKUGIN_BS) && (play->sceneNum != SCENE_SEA_BS) && (play->sceneNum != SCENE_INISIE_BS) && (play->sceneNum != SCENE_LAST_BS) && diff --git a/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.c b/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.c index 1a0cb5058..45286fccb 100644 --- a/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.c +++ b/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.c @@ -273,7 +273,7 @@ void func_80A70F2C(BgCraceMovebg* this, PlayState* play) { func_80A70C04(this, play); if (Math_StepToF(&this->unk160, 0.0f, 1.0f)) { if (!(this->unk170 & 2) && !Flags_GetSwitch(play, BGCRACEMOVEBG_GET_7F0(&this->dyna.actor) + 1)) { - play->unk_18845 = 1; + play->haltAllActors = true; func_80169FDC(&play->state); play_sound(NA_SE_OC_ABYSS); } diff --git a/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c b/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c index 77bf92531..902b52776 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c +++ b/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c @@ -650,7 +650,7 @@ void func_80B814B8(BgIkanaRotaryroom* this, PlayState* play) { func_800B8E58(player, NA_SE_VO_LI_DAMAGE_S + player->ageProperties->unk_92); func_80169EFC(&play->state); func_800B8E58(player, NA_SE_VO_LI_TAKEN_AWAY + player->ageProperties->unk_92); - play->unk_18845 = 1; + play->haltAllActors = true; play_sound(NA_SE_OC_ABYSS); this->actionFunc = NULL; } diff --git a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c index 386996325..0efed2253 100644 --- a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c +++ b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c @@ -216,7 +216,7 @@ void func_80953F9C(BgIngate* this, PlayState* play) { if (ActorCutscene_GetCurrentIndex() != -1) { Camera_ChangeSetting(mainCam, CAM_SET_NORMAL0); player->stateFlags1 |= 0x20; - play->actorCtx.flags &= ~ACTORCTX_FLAG_2; + play->actorCtx.flags &= ~ACTORCTX_FLAG_PICTOGRAPH_ON; } else { Camera_ChangeSetting(mainCam, CAM_SET_BOAT_CRUISE); player->stateFlags1 &= ~0x20; diff --git a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c index 6d7cc29ea..c000db32b 100644 --- a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c +++ b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c @@ -346,7 +346,7 @@ void EnKakasi_IdleStanding(EnKakasi* this, PlayState* play) { EnKakasi_SetupDialogue(this); return; } - if (play->actorCtx.flags & ACTORCTX_FLAG_2) { + if (play->actorCtx.flags & ACTORCTX_FLAG_PICTOGRAPH_ON) { Actor_GetScreenPos(play, &this->picto.actor, &x, &y); if (this->picto.actor.projectedPos.z > -20.0f && x > 0 && x < SCREEN_WIDTH && y > 0 && y < SCREEN_HEIGHT && this->animIndex != ENKAKASI_ANIM_SIDEWAYS_SHAKING) { 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 8be05703f..40883d8dd 100644 --- a/src/overlays/actors/ovl_En_Test4/z_en_test4.c +++ b/src/overlays/actors/ovl_En_Test4/z_en_test4.c @@ -385,8 +385,8 @@ void func_80A42AB8(EnTest4* this, PlayState* play) { if ((temp_a3 * temp_a2) <= 0) { gSaveContext.unk_3CA7 = 1; - if (play->actorCtx.flags & ACTORCTX_FLAG_2) { - play->actorCtx.flags &= ~ACTORCTX_FLAG_2; + if (play->actorCtx.flags & ACTORCTX_FLAG_PICTOGRAPH_ON) { + play->actorCtx.flags &= ~ACTORCTX_FLAG_PICTOGRAPH_ON; } if (temp_a0 != CLOCK_TIME(6, 0)) { diff --git a/tools/disasm/functions.txt b/tools/disasm/functions.txt index 5211784fd..18dd408a3 100644 --- a/tools/disasm/functions.txt +++ b/tools/disasm/functions.txt @@ -2104,8 +2104,8 @@ 0x8010EF9C:("Interface_UpdateButtonAlphasByStatus",), 0x8010F0D4:("Interface_UpdateButtonAlphas",), 0x8010F1A8:("Interface_UpdateHudAlphas",), - 0x80110038:("func_80110038",), - 0x80111CB4:("func_80111CB4",), + 0x80110038:("Interface_UpdateButtonsPart2",), + 0x80111CB4:("Interface_UpdateButtonsPart1",), 0x801129E4:("Interface_SetSceneRestrictions",), 0x80112AF4:("Interface_Noop",), 0x80112AFC:("Interface_InitMinigame",), diff --git a/tools/disasm/variables.txt b/tools/disasm/variables.txt index dbfd4e89b..2d78a2d17 100644 --- a/tools/disasm/variables.txt +++ b/tools/disasm/variables.txt @@ -1063,8 +1063,8 @@ 0x801BF5C0:("D_801BF5C0","UNK_PTR","",0x4), 0x801BF68C:("D_801BF68C","UNK_TYPE1","",0x1), 0x801BF6C0:("sRestrictionFlags","RestrictionFlags","[113]",0x1c4), - 0x801BF884:("D_801BF884","UNK_TYPE2","",0x2), - 0x801BF888:("D_801BF888","UNK_TYPE2","",0x2), + 0x801BF884:("sPictographState","UNK_TYPE2","",0x2), + 0x801BF888:("sPictographPhotoBeingTaken","UNK_TYPE2","",0x2), 0x801BF88C:("sHBAScoreTier","UNK_TYPE2","",0x2), 0x801BF890:("sMinigameScoreDigits","UNK_TYPE2","",0x2), 0x801BF898:("sCUpInvisible","UNK_TYPE2","",0x2), diff --git a/tools/sizes/code_functions.csv b/tools/sizes/code_functions.csv index b4f269d36..9e1257230 100644 --- a/tools/sizes/code_functions.csv +++ b/tools/sizes/code_functions.csv @@ -1618,8 +1618,8 @@ asm/non_matchings/code/z_parameter/Interface_SetHudVisibility.s,Interface_SetHud 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 +asm/non_matchings/code/z_parameter/Interface_UpdateButtonsPart2.s,Interface_UpdateButtonsPart2,0x80110038,0x71F +asm/non_matchings/code/z_parameter/Interface_UpdateButtonsPart1.s,Interface_UpdateButtonsPart1,0x80111CB4,0x34C asm/non_matchings/code/z_parameter/Interface_SetSceneRestrictions.s,Interface_SetSceneRestrictions,0x801129E4,0x44 asm/non_matchings/code/z_parameter/Interface_Noop.s,Interface_Noop,0x80112AF4,0x2 asm/non_matchings/code/z_parameter/Interface_InitMinigame.s,Interface_InitMinigame,0x80112AFC,0x11