mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-02-23 07:45:55 +00:00
Code Issues Projects Releases Wiki Activity

post-merge doc

Browse source
This commit is contained in:
Dragorn421 2024-08-24 20:19:54 +02:00
parent 538a12ba70
commit 477a4cca64
No known key found for this signature in database
GPG key ID: 381AEBAF3D429335
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c
View file

@ -1594,8 +1594,8 @@ void KaleidoScope_DrawPages(PlayState* play, GraphicsContext* gfxCtx) {
(pauseCtx->savePromptState >= PAUSE_SAVE_PROMPT_STATE_SAVED)) || (pauseCtx->savePromptState >= PAUSE_SAVE_PROMPT_STATE_SAVED)) ||
pauseCtx->state == PAUSE_STATE_15) { pauseCtx->state == PAUSE_STATE_15) {
#if PLATFORM_N64 #if PLATFORM_N64
POLY_OPA_DISP = POLY_OPA_DISP = KaleidoScope_QuadTextureIA8(POLY_OPA_DISP, sSaveConfirmationTexs[gSaveContext.language],
KaleidoScope_QuadTextureIA8(POLY_OPA_DISP, sSaveConfirmationTexs[gSaveContext.language], 152, 16, 0); 152, 16, QUAD_PROMPT_MESSAGE * 4);
#endif #endif
} else if ((pauseCtx->state == PAUSE_STATE_16) || (pauseCtx->state == PAUSE_STATE_17)) { } else if ((pauseCtx->state == PAUSE_STATE_16) || (pauseCtx->state == PAUSE_STATE_17)) {
@ -4299,7 +4299,7 @@ void KaleidoScope_Update(PlayState* play) {
sDelayTimer = 90; sDelayTimer = 90;
#else #else
sDelayTimer = 3; sDelayTimer = 3;
#endif #endif
} }
} else if (CHECK_BTN_ALL(input->press.button, BTN_START) || } else if (CHECK_BTN_ALL(input->press.button, BTN_START) ||
CHECK_BTN_ALL(input->press.button, BTN_B)) { CHECK_BTN_ALL(input->press.button, BTN_B)) {