diff options
| author | Leonid Kapitonov <Feacur@gmail.com> | 2024-11-15 09:37:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-15 03:37:10 -0500 |
| commit | e46fcbdbc95a2b1a87f1a79f7d40be19fc2013ee (patch) | |
| tree | c38a8a63cb59e68aa5653b9b19633fa93a3e3ee4 /src/code | |
| parent | c55a1dab5727784a4a7510cdb6602d539134a7f1 (diff) | |
Document `enum PauseState` game over parts (#2283)
* [document] `enum PauseState`, game over parts
* apply Jenkins fixes (automatic code formatting)
also, as previously, i've rerun the "make" to check integrity
* add `PAUSE_STATE_GAME_OVER_*` comments
in case it helps to rename them later, if the need ever arises
* improve `PAUSE_STATE_GAME_OVER_SAVE_*` comments
also i've noticed, that `z64pause.h` doesn't comply fully with the `.clang-format`
temporary changing a couple of setting to
- ColumnLimit: 0
- AlignTrailingComments: false
fixes the issue. i don't want to push unrelated formatting here
* remove redundant comments
https://github.com/zeldaret/oot/pull/2283#discussion_r1827652667
* apply PR naming suggestions
reverified with
> `check_format.py ...`
> `make ...`
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_game_over.c | 2 | ||||
| -rw-r--r-- | src/code/z_kaleido_scope_call.c | 14 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/code/z_game_over.c b/src/code/z_game_over.c index e6335307d..f0390a961 100644 --- a/src/code/z_game_over.c +++ b/src/code/z_game_over.c @@ -102,7 +102,7 @@ void GameOver_Update(PlayState* play) { sGameOverTimer--; if (sGameOverTimer == 0) { - play->pauseCtx.state = PAUSE_STATE_8; + play->pauseCtx.state = PAUSE_STATE_GAME_OVER_START; gameOverCtx->state++; Rumble_Reset(); } diff --git a/src/code/z_kaleido_scope_call.c b/src/code/z_kaleido_scope_call.c index 84b7ade06..42dc94ed8 100644 --- a/src/code/z_kaleido_scope_call.c +++ b/src/code/z_kaleido_scope_call.c @@ -70,7 +70,7 @@ void KaleidoScopeCall_Update(PlayState* play) { pauseCtx->savePromptState = PAUSE_SAVE_PROMPT_STATE_APPEARING; pauseCtx->state = (pauseCtx->state & 0xFFFF) + 1; // PAUSE_STATE_WAIT_BG_PRERENDER } - } else if (pauseCtx->state == PAUSE_STATE_8) { + } else if (pauseCtx->state == PAUSE_STATE_GAME_OVER_START) { #if OOT_DEBUG R_HREG_MODE = HREG_MODE_UCODE_DISAS; R_UCODE_DISAS_LOG_MODE = 3; @@ -78,13 +78,14 @@ void KaleidoScopeCall_Update(PlayState* play) { R_PAUSE_BG_PRERENDER_STATE = PAUSE_BG_PRERENDER_SETUP; pauseCtx->mainState = PAUSE_MAIN_STATE_IDLE; - pauseCtx->savePromptState = PAUSE_SAVE_PROMPT_STATE_APPEARING; - pauseCtx->state = (pauseCtx->state & 0xFFFF) + 1; // PAUSE_STATE_9 - } else if ((pauseCtx->state == PAUSE_STATE_WAIT_BG_PRERENDER) || (pauseCtx->state == PAUSE_STATE_9)) { + pauseCtx->savePromptState = PAUSE_SAVE_PROMPT_STATE_APPEARING; // copied from pause menu, not needed here + pauseCtx->state = (pauseCtx->state & 0xFFFF) + 1; // PAUSE_STATE_GAME_OVER_WAIT_BG_PRERENDER + } else if ((pauseCtx->state == PAUSE_STATE_WAIT_BG_PRERENDER) || + (pauseCtx->state == PAUSE_STATE_GAME_OVER_WAIT_BG_PRERENDER)) { PRINTF("PR_KAREIDOSCOPE_MODE=%d\n", R_PAUSE_BG_PRERENDER_STATE); if (R_PAUSE_BG_PRERENDER_STATE >= PAUSE_BG_PRERENDER_READY) { - pauseCtx->state++; // PAUSE_STATE_INIT or PAUSE_STATE_10 + pauseCtx->state++; // PAUSE_STATE_INIT or PAUSE_STATE_GAME_OVER_INIT } } else if (pauseCtx->state != PAUSE_STATE_OFF) { if (gKaleidoMgrCurOvl != kaleidoScopeOvl) { @@ -124,7 +125,8 @@ void KaleidoScopeCall_Draw(PlayState* play) { if (R_PAUSE_BG_PRERENDER_STATE >= PAUSE_BG_PRERENDER_READY) { if (((play->pauseCtx.state >= PAUSE_STATE_OPENING_1) && (play->pauseCtx.state <= PAUSE_STATE_SAVE_PROMPT)) || - ((play->pauseCtx.state >= PAUSE_STATE_11) && (play->pauseCtx.state <= PAUSE_STATE_CLOSING))) { + ((play->pauseCtx.state >= PAUSE_STATE_GAME_OVER_SHOW_MESSAGE) && + (play->pauseCtx.state <= PAUSE_STATE_CLOSING))) { if (gKaleidoMgrCurOvl == kaleidoScopeOvl) { sKaleidoScopeDrawFunc(play); } |
