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

R_PAUSE_CURSOR_L_R_SELECTED_PRIM_TIMER -> R_PAUSE_BUTTON_L_R_SELECTED_PRIM_TIMER

This commit is contained in:
Dragorn421 2025-06-28 08:56:01 +02:00
parent 6bce0c0eba
commit 36616dd592
No known key found for this signature in database
GPG Key ID: 05949E029F4EF294
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/regs.h
View File

@ -126,7 +126,7 @@ struct PlayState;
#define R_EPONAS_SONG_PLAYED DREG(53)
#define R_MAGIC_FILL_COLOR(i) ZREG(0 + (i))
#define R_PAUSE_PAGE_SWITCH_FRAME_ADVANCE_ON ZREG(13)
#define R_PAUSE_CURSOR_L_R_SELECTED_PRIM_TIMER ZREG(28)
#define R_PAUSE_BUTTON_L_R_SELECTED_PRIM_TIMER ZREG(28)
#define R_C_BTN_COLOR(i) ZREG(39 + (i))
#define R_B_BTN_COLOR(i) ZREG(43 + (i))
#if OOT_NTSC

2
src/code/z_construct.c
View File

@ -352,7 +352,7 @@ void Regs_InitDataImpl(void) {
ZREG(25) = 4;
ZREG(26) = 20;
ZREG(27) = 10;
R_PAUSE_CURSOR_L_R_SELECTED_PRIM_TIMER = 20;
R_PAUSE_BUTTON_L_R_SELECTED_PRIM_TIMER = 20;
ZREG(29) = 4;
ZREG(30) = 20;
ZREG(31) = 10;

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

@ -1758,7 +1758,7 @@ void KaleidoScope_DrawUIOverlay(PlayState* play) {
sLRSelectedPrimG = sLRSelectedPrimColors[sLRSelectedPrimState][1];
sLRSelectedPrimB = sLRSelectedPrimColors[sLRSelectedPrimState][2];
sLRSelectedPrimA = sLRSelectedPrimColors[sLRSelectedPrimState][3];
sLRSelectedPrimTimer = R_PAUSE_CURSOR_L_R_SELECTED_PRIM_TIMER;
sLRSelectedPrimTimer = R_PAUSE_BUTTON_L_R_SELECTED_PRIM_TIMER;
sLRSelectedPrimState ^= 1;
}