falso
/
oot
mirror of https://github.com/zeldaret/oot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sSavedButtonStatus

This commit is contained in:
Dragorn421 2025-05-29 18:31:11 +02:00
parent c2ce47db24
commit bae2d53e08
No known key found for this signature in database
GPG Key ID: 381AEBAF3D429335
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c
View File

@ -933,7 +933,7 @@ static void* sPromptChoiceTexs[][2] = {
//! non-static, but we make it static here to match the bss order and patch the relocation section later in the build //! non-static, but we make it static here to match the bss order and patch the relocation section later in the build
//! as our relocation generator does count COMMON symbols. //! as our relocation generator does count COMMON symbols.
static u8 D_808321A8_savedButtonStatus[5]; static u8 sSavedButtonStatus[5];
static PreRender sPlayerPreRender; static PreRender sPlayerPreRender;
void* sPreRenderCvg; void* sPreRenderCvg;
@ -3714,11 +3714,11 @@ void KaleidoScope_Update(PlayState* play) {
switch (pauseCtx->state) { switch (pauseCtx->state) {
case PAUSE_STATE_INIT: case PAUSE_STATE_INIT:
D_808321A8_savedButtonStatus[0] = gSaveContext.buttonStatus[0]; sSavedButtonStatus[0] = gSaveContext.buttonStatus[0];
D_808321A8_savedButtonStatus[1] = gSaveContext.buttonStatus[1]; sSavedButtonStatus[1] = gSaveContext.buttonStatus[1];
D_808321A8_savedButtonStatus[2] = gSaveContext.buttonStatus[2]; sSavedButtonStatus[2] = gSaveContext.buttonStatus[2];
D_808321A8_savedButtonStatus[3] = gSaveContext.buttonStatus[3]; sSavedButtonStatus[3] = gSaveContext.buttonStatus[3];
D_808321A8_savedButtonStatus[4] = gSaveContext.buttonStatus[4]; sSavedButtonStatus[4] = gSaveContext.buttonStatus[4];
pauseCtx->cursorX[PAUSE_MAP] = 0; pauseCtx->cursorX[PAUSE_MAP] = 0;
pauseCtx->cursorSlot[PAUSE_MAP] = pauseCtx->cursorPoint[PAUSE_MAP] = pauseCtx->dungeonMapSlot = pauseCtx->cursorSlot[PAUSE_MAP] = pauseCtx->cursorPoint[PAUSE_MAP] = pauseCtx->dungeonMapSlot =
@ -4763,11 +4763,11 @@ void KaleidoScope_Update(PlayState* play) {
break; break;
} }
gSaveContext.buttonStatus[0] = D_808321A8_savedButtonStatus[0]; gSaveContext.buttonStatus[0] = sSavedButtonStatus[0];
gSaveContext.buttonStatus[1] = D_808321A8_savedButtonStatus[1]; gSaveContext.buttonStatus[1] = sSavedButtonStatus[1];
gSaveContext.buttonStatus[2] = D_808321A8_savedButtonStatus[2]; gSaveContext.buttonStatus[2] = sSavedButtonStatus[2];
gSaveContext.buttonStatus[3] = D_808321A8_savedButtonStatus[3]; gSaveContext.buttonStatus[3] = sSavedButtonStatus[3];
gSaveContext.buttonStatus[4] = D_808321A8_savedButtonStatus[4]; gSaveContext.buttonStatus[4] = sSavedButtonStatus[4];
interfaceCtx->unk_1FA = interfaceCtx->unk_1FC = 0; interfaceCtx->unk_1FA = interfaceCtx->unk_1FC = 0;