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

Merge remote-tracking branch 'origin/doc_pause_menu' into doc_pause_menu

Browse source
This commit is contained in:
Dragorn421 2023-11-04 21:45:41 +01:00
commit 4f312782c5
No known key found for this signature in database
GPG key ID: 381AEBAF3D429335
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/code/z_kaleido_setup.c
View file

@ -61,8 +61,12 @@ void KaleidoSetup_Update(PlayState* play) {
R_PAUSE_CURSOR_RIGHT_X = 155;
pauseCtx->switchPageTimer = 0;
pauseCtx->mainState = PAUSE_MAIN_STATE_SWITCHING_PAGE; // irrelevant
// irrelevant, the initial page switch animation is handled by KaleidoScope_UpdateOpening
// and mainState is reset to idle before reaching the main state anyway (KaleidoScopeCall_Update)
pauseCtx->mainState = PAUSE_MAIN_STATE_SWITCHING_PAGE;
//! @bug using an unrelated reg
if (R_START_LABEL_DD(0) == 0) {
// Never reached, unused, and the data would be wrong anyway
pauseCtx->eye.x = sKaleidoSetupUnusedEyeX[pauseCtx->pageIndex];
@ -109,9 +113,11 @@ void KaleidoSetup_Init(PlayState* play) {
pauseCtx->pageIndex = PAUSE_ITEM;
pauseCtx->itemPageRoll = pauseCtx->equipPageRoll = pauseCtx->mapPageRoll = pauseCtx->questPageRoll = 160.0f;
pauseCtx->eye.z = 64.0f;
// Setting the eye xz here is irrelevant, it's set on pausing in KaleidoSetup_Update
pauseCtx->eye.z = -PAUSE_EYE_DIST * PAUSE_ITEM_Z;
pauseCtx->eye.y = 0.0f;
pauseCtx->eye.x = 0.0f; // -PAUSE_EYE_DIST * PAUSE_ITEM_X
pauseCtx->savePromptOffsetDepth_ = 936.0f;
pauseCtx->eye.x = pauseCtx->eye.y = 0.0f;
pauseCtx->rollRotSavePrompt_ = -314.0f;
pauseCtx->cursorPoint[PAUSE_ITEM] = 0;

2
src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
View file

@ -1320,7 +1320,7 @@ void KaleidoScope_DrawPages(PlayState* play, GraphicsContext* gfxCtx) {
}
}
// Uodate and draw save / game over prompt
// Update and draw save / game over prompt
Gfx_SetupDL_42Opa(gfxCtx);