diff --git a/include/regs.h b/include/regs.h index f68dfe56b8..6657c334bc 100644 --- a/include/regs.h +++ b/include/regs.h @@ -49,6 +49,7 @@ #define R_RUN_SPEED_LIMIT REG(45) #define R_ENABLE_ARENA_DBG SREG(0) #define R_UPDATE_RATE SREG(30) +#define R_GRAPH_TASKSET00_FLAGS SREG(33) #define R_ENABLE_AUDIO_DBG SREG(36) #define R_FB_FILTER_TYPE SREG(80) #define R_FB_FILTER_PRIM_COLOR(c) SREG(81 + (c)) diff --git a/src/code/graph.c b/src/code/graph.c index fc41f1a610..aeb32f58a5 100644 --- a/src/code/graph.c +++ b/src/code/graph.c @@ -222,8 +222,8 @@ void Graph_TaskSet00(GraphicsContext* gfxCtx) { scTask->next = NULL; scTask->flags = OS_SC_NEEDS_RSP | OS_SC_NEEDS_RDP | OS_SC_SWAPBUFFER | OS_SC_LAST_TASK; - if (SREG(33) & 1) { - SREG(33) &= ~1; + if (R_GRAPH_TASKSET00_FLAGS & 1) { + R_GRAPH_TASKSET00_FLAGS &= ~1; scTask->flags &= ~OS_SC_SWAPBUFFER; gfxCtx->fbIdx--; } diff --git a/src/code/z_play.c b/src/code/z_play.c index bf21fc5bed..bb423a59be 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -1234,21 +1234,22 @@ void Play_Draw(PlayState* this) { } if ((R_PAUSE_MENU_MODE == PAUSE_MENU_REG_MODE_1) || (gTrnsnUnkState == 1)) { - Gfx* sp70 = OVERLAY_DISP; + Gfx* gfxP = OVERLAY_DISP; this->pauseBgPreRender.fbuf = gfxCtx->curFrameBuffer; this->pauseBgPreRender.fbufSave = (u16*)gZBuffer; - PreRender_SaveFramebuffer(&this->pauseBgPreRender, &sp70); + PreRender_SaveFramebuffer(&this->pauseBgPreRender, &gfxP); if (R_PAUSE_MENU_MODE == PAUSE_MENU_REG_MODE_1) { this->pauseBgPreRender.cvgSave = (u8*)gfxCtx->curFrameBuffer; - PreRender_DrawCoverage(&this->pauseBgPreRender, &sp70); + PreRender_DrawCoverage(&this->pauseBgPreRender, &gfxP); + R_PAUSE_MENU_MODE = PAUSE_MENU_REG_MODE_2; } else { gTrnsnUnkState = 2; } - OVERLAY_DISP = sp70; + OVERLAY_DISP = gfxP; this->unk_121C7 = 2; - SREG(33) |= 1; + R_GRAPH_TASKSET00_FLAGS |= 1; } else { Play_Draw_DrawOverlayElements: if ((HREG(80) != 10) || (HREG(89) != 0)) { diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c index b0bb7919fc..31536d3ab1 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c @@ -273,7 +273,7 @@ void KaleidoScope_SetupPlayerPreRender(PlayState* play) { Graph_BranchDlist(gfxRef, gfx); POLY_OPA_DISP = gfx; - SREG(33) |= 1; + R_GRAPH_TASKSET00_FLAGS |= 1; CLOSE_DISPS(play->state.gfxCtx, "../z_kaleido_scope_PAL.c", 509); }