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

Look at pause menu startup (wip)

Browse source
This commit is contained in:
Dragorn421 2022-08-29 07:25:32 +02:00
parent a02cbf5d12
commit 236c0603ed
No known key found for this signature in database
GPG key ID: 32B53D2D16FC4118
4 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/regs.h
View file

@ -49,6 +49,7 @@
#define R_RUN_SPEED_LIMIT REG(45) #define R_RUN_SPEED_LIMIT REG(45)
#define R_ENABLE_ARENA_DBG SREG(0) #define R_ENABLE_ARENA_DBG SREG(0)
#define R_UPDATE_RATE SREG(30) #define R_UPDATE_RATE SREG(30)
#define R_GRAPH_TASKSET00_FLAGS SREG(33)
#define R_ENABLE_AUDIO_DBG SREG(36) #define R_ENABLE_AUDIO_DBG SREG(36)
#define R_FB_FILTER_TYPE SREG(80) #define R_FB_FILTER_TYPE SREG(80)
#define R_FB_FILTER_PRIM_COLOR(c) SREG(81 + (c)) #define R_FB_FILTER_PRIM_COLOR(c) SREG(81 + (c))

4
src/code/graph.c
View file

@ -222,8 +222,8 @@ void Graph_TaskSet00(GraphicsContext* gfxCtx) {
scTask->next = NULL; scTask->next = NULL;
scTask->flags = OS_SC_NEEDS_RSP | OS_SC_NEEDS_RDP | OS_SC_SWAPBUFFER | OS_SC_LAST_TASK; scTask->flags = OS_SC_NEEDS_RSP | OS_SC_NEEDS_RDP | OS_SC_SWAPBUFFER | OS_SC_LAST_TASK;
if (SREG(33) & 1) { if (R_GRAPH_TASKSET00_FLAGS & 1) {
SREG(33) &= ~1; R_GRAPH_TASKSET00_FLAGS &= ~1;
scTask->flags &= ~OS_SC_SWAPBUFFER; scTask->flags &= ~OS_SC_SWAPBUFFER;
gfxCtx->fbIdx--; gfxCtx->fbIdx--;
} }

11
src/code/z_play.c
View file

@ -1234,21 +1234,22 @@ void Play_Draw(PlayState* this) {
} }
if ((R_PAUSE_MENU_MODE == PAUSE_MENU_REG_MODE_1) || (gTrnsnUnkState == 1)) { 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.fbuf = gfxCtx->curFrameBuffer;
this->pauseBgPreRender.fbufSave = (u16*)gZBuffer; 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) { if (R_PAUSE_MENU_MODE == PAUSE_MENU_REG_MODE_1) {
this->pauseBgPreRender.cvgSave = (u8*)gfxCtx->curFrameBuffer; 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; R_PAUSE_MENU_MODE = PAUSE_MENU_REG_MODE_2;
} else { } else {
gTrnsnUnkState = 2; gTrnsnUnkState = 2;
} }
OVERLAY_DISP = sp70; OVERLAY_DISP = gfxP;
this->unk_121C7 = 2; this->unk_121C7 = 2;
SREG(33) |= 1; R_GRAPH_TASKSET00_FLAGS |= 1;
} else { } else {
Play_Draw_DrawOverlayElements: Play_Draw_DrawOverlayElements:
if ((HREG(80) != 10) || (HREG(89) != 0)) { if ((HREG(80) != 10) || (HREG(89) != 0)) {

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

@ -273,7 +273,7 @@ void KaleidoScope_SetupPlayerPreRender(PlayState* play) {
Graph_BranchDlist(gfxRef, gfx); Graph_BranchDlist(gfxRef, gfx);
POLY_OPA_DISP = gfx; POLY_OPA_DISP = gfx;
SREG(33) |= 1; R_GRAPH_TASKSET00_FLAGS |= 1;
CLOSE_DISPS(play->state.gfxCtx, "../z_kaleido_scope_PAL.c", 509); CLOSE_DISPS(play->state.gfxCtx, "../z_kaleido_scope_PAL.c", 509);
} }