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

more reverts

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

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

@ -1224,25 +1224,22 @@ Gfx* KaleidoScope_DrawPageSections(Gfx* gfx, Vtx* vertices, void** textures) {
} }
void KaleidoScope_DrawPages(PlayState* play, GraphicsContext* gfxCtx) { void KaleidoScope_DrawPages(PlayState* play, GraphicsContext* gfxCtx) {
static s16 sCursorColors_D_8082ACF4[][3] = { static s16 D_8082ACF4[][3] = {
// "white" ?
{ 0, 0, 0 }, { 0, 0, 0 },
{ 0, 0, 0 }, { 0, 0, 0 },
{ 0, 0, 0 }, { 0, 0, 0 },
{ 0, 0, 0 }, { 0, 0, 0 },
// yellow
{ 255, 255, 0 }, { 255, 255, 0 },
{ 0, 0, 0 }, { 0, 0, 0 },
{ 0, 0, 0 }, { 0, 0, 0 },
{ 255, 255, 0 }, { 255, 255, 0 },
// n64: ? / gc: green
{ KALEIDO_COLOR_CURSOR_UNK_R, KALEIDO_COLOR_CURSOR_UNK_G, KALEIDO_COLOR_CURSOR_UNK_B }, { KALEIDO_COLOR_CURSOR_UNK_R, KALEIDO_COLOR_CURSOR_UNK_G, KALEIDO_COLOR_CURSOR_UNK_B },
{ 0, 0, 0 }, { 0, 0, 0 },
{ 0, 0, 0 }, { 0, 0, 0 },
{ KALEIDO_COLOR_CURSOR_UNK_R, KALEIDO_COLOR_CURSOR_UNK_G, KALEIDO_COLOR_CURSOR_UNK_B }, { KALEIDO_COLOR_CURSOR_UNK_R, KALEIDO_COLOR_CURSOR_UNK_G, KALEIDO_COLOR_CURSOR_UNK_B },
}; };
static s16 sCursorColorBlinkTimer_D_8082AD3C = 20; static s16 D_8082AD3C = 20;
static s16 sCursorColorBlinkOffset_D_8082AD40 = 0; static s16 D_8082AD40 = 0;
static s16 sStickXRepeatTimer = 0; static s16 sStickXRepeatTimer = 0;
static s16 sStickYRepeatTimer = 0; static s16 sStickYRepeatTimer = 0;
@ -1258,43 +1255,34 @@ void KaleidoScope_DrawPages(PlayState* play, GraphicsContext* gfxCtx) {
if (!IS_PAUSE_STATE_GAMEOVER(pauseCtx)) { if (!IS_PAUSE_STATE_GAMEOVER(pauseCtx)) {
if (pauseCtx->state != PAUSE_STATE_SAVE_PROMPT) { if (pauseCtx->state != PAUSE_STATE_SAVE_PROMPT) {
stepR = ABS(D_8082AB8C - stepR = ABS(D_8082AB8C - D_8082ACF4[pauseCtx->cursorColorSet + D_8082AD40][0]) / D_8082AD3C;
sCursorColors_D_8082ACF4[pauseCtx->cursorColorSet + sCursorColorBlinkOffset_D_8082AD40][0]) / stepG = ABS(D_8082AB90 - D_8082ACF4[pauseCtx->cursorColorSet + D_8082AD40][1]) / D_8082AD3C;
sCursorColorBlinkTimer_D_8082AD3C; stepB = ABS(D_8082AB94 - D_8082ACF4[pauseCtx->cursorColorSet + D_8082AD40][2]) / D_8082AD3C;
stepG = ABS(D_8082AB90 - if (D_8082AB8C >= D_8082ACF4[pauseCtx->cursorColorSet + D_8082AD40][0]) {
sCursorColors_D_8082ACF4[pauseCtx->cursorColorSet + sCursorColorBlinkOffset_D_8082AD40][1]) /
sCursorColorBlinkTimer_D_8082AD3C;
stepB = ABS(D_8082AB94 -
sCursorColors_D_8082ACF4[pauseCtx->cursorColorSet + sCursorColorBlinkOffset_D_8082AD40][2]) /
sCursorColorBlinkTimer_D_8082AD3C;
if (D_8082AB8C >=
sCursorColors_D_8082ACF4[pauseCtx->cursorColorSet + sCursorColorBlinkOffset_D_8082AD40][0]) {
D_8082AB8C -= stepR; D_8082AB8C -= stepR;
} else { } else {
D_8082AB8C += stepR; D_8082AB8C += stepR;
} }
if (D_8082AB90 >= if (D_8082AB90 >= D_8082ACF4[pauseCtx->cursorColorSet + D_8082AD40][1]) {
sCursorColors_D_8082ACF4[pauseCtx->cursorColorSet + sCursorColorBlinkOffset_D_8082AD40][1]) {
D_8082AB90 -= stepG; D_8082AB90 -= stepG;
} else { } else {
D_8082AB90 += stepG; D_8082AB90 += stepG;
} }
if (D_8082AB94 >= if (D_8082AB94 >= D_8082ACF4[pauseCtx->cursorColorSet + D_8082AD40][2]) {
sCursorColors_D_8082ACF4[pauseCtx->cursorColorSet + sCursorColorBlinkOffset_D_8082AD40][2]) {
D_8082AB94 -= stepB; D_8082AB94 -= stepB;
} else { } else {
D_8082AB94 += stepB; D_8082AB94 += stepB;
} }
sCursorColorBlinkTimer_D_8082AD3C--; D_8082AD3C--;
if (sCursorColorBlinkTimer_D_8082AD3C == 0) { if (D_8082AD3C == 0) {
D_8082AB8C = sCursorColors_D_8082ACF4[pauseCtx->cursorColorSet + sCursorColorBlinkOffset_D_8082AD40][0]; D_8082AB8C = D_8082ACF4[pauseCtx->cursorColorSet + D_8082AD40][0];
D_8082AB90 = sCursorColors_D_8082ACF4[pauseCtx->cursorColorSet + sCursorColorBlinkOffset_D_8082AD40][1]; D_8082AB90 = D_8082ACF4[pauseCtx->cursorColorSet + D_8082AD40][1];
D_8082AB94 = sCursorColors_D_8082ACF4[pauseCtx->cursorColorSet + sCursorColorBlinkOffset_D_8082AD40][2]; D_8082AB94 = D_8082ACF4[pauseCtx->cursorColorSet + D_8082AD40][2];
sCursorColorBlinkTimer_D_8082AD3C = ZREG(28 + sCursorColorBlinkOffset_D_8082AD40); D_8082AD3C = ZREG(28 + D_8082AD40);
sCursorColorBlinkOffset_D_8082AD40++; D_8082AD40++;
if (sCursorColorBlinkOffset_D_8082AD40 >= 4) { if (D_8082AD40 >= 4) {
sCursorColorBlinkOffset_D_8082AD40 = 0; D_8082AD40 = 0;
} }
} }