mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-13 11:24:40 +00:00
Code Issues Projects Releases Wiki Activity

cleanup/finalize known main substates names

Browse source
This commit is contained in:
Dragorn421 2022-08-29 12:39:04 +02:00
parent 23d2ce1eb7
commit e8eb909b12
No known key found for this signature in database
GPG key ID: 32B53D2D16FC4118
10 changed files with 114 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/code/z_construct.c
View file

@ -270,7 +270,7 @@ void func_80111070(void) {
ZREG(10) = 200;
ZREG(11) = 0;
ZREG(12) = 200;
R_PAUSE_PAGE_CHANGE_FRAME_ADVANCE_ON = false;
R_PAUSE_SWITCH_PAGE_FRAME_ADVANCE_ON = false;
ZREG(14) = 110;
ZREG(15) = 56;
ZREG(16) = 1;

4
src/code/z_kaleido_scope_call.c
View file

@ -62,7 +62,7 @@ void KaleidoScopeCall_Update(PlayState* play) {
HREG(80) = 7;
HREG(82) = 3;
R_PAUSE_BG_PRERENDER_STATE = PAUSE_BG_PRERENDER_DRAW;
pauseCtx->mainSubState = PAUSE_MAIN_STATE_0_IDLE_;
pauseCtx->mainSubState = PAUSE_MAIN_STATE_IDLE;
pauseCtx->unk_1EC_ps7_ = PAUSE_S7_0;
pauseCtx->state = (pauseCtx->state & 0xFFFF) + 1; // PAUSE_STATE_WAIT_BG_PRERENDER
}
@ -70,7 +70,7 @@ void KaleidoScopeCall_Update(PlayState* play) {
HREG(80) = 7;
HREG(82) = 3;
R_PAUSE_BG_PRERENDER_STATE = PAUSE_BG_PRERENDER_DRAW;
pauseCtx->mainSubState = PAUSE_MAIN_STATE_0_IDLE_;
pauseCtx->mainSubState = PAUSE_MAIN_STATE_IDLE;
pauseCtx->unk_1EC_ps7_ = PAUSE_S7_0;
pauseCtx->state = (pauseCtx->state & 0xFFFF) + 1; // PAUSE_STATE_9
} else if ((pauseCtx->state == PAUSE_STATE_WAIT_BG_PRERENDER) || (pauseCtx->state == PAUSE_STATE_9)) {

5
src/code/z_kaleido_setup.c
View file

@ -42,8 +42,7 @@ void KaleidoSetup_Update(PlayState* play) {
R_PAUSE_CURSOR_RIGHT_X = 155;
pauseCtx->unk_1EA_OpenMenuAndPageSwitchTimer__ = 0;
pauseCtx->mainSubState = PAUSE_MAIN_STATE_1_SWITCH_PAGE_; // irrelevant? reset in PAUSE_STATE_WAIT_LETTERBOX
// by KaleidoScopeCall_Update
pauseCtx->mainSubState = PAUSE_MAIN_STATE_SWITCHING_PAGE; // irrelevant
if (R_START_LABEL_DD(0) == 0) {
pauseCtx->eye.x = sKaleidoSetupEyeX0[pauseCtx->pageIndex];
@ -83,7 +82,7 @@ void KaleidoSetup_Init(PlayState* play) {
pauseCtx->debugState = 0;
pauseCtx->alpha = 0;
pauseCtx->unk_1EA_OpenMenuAndPageSwitchTimer__ = 0;
pauseCtx->mainSubState = PAUSE_MAIN_STATE_0_IDLE_;
pauseCtx->mainSubState = PAUSE_MAIN_STATE_IDLE;
pauseCtx->mode = 0;
pauseCtx->pageIndex = PAUSE_ITEM;