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

gameover states cleanup

Browse source
This commit is contained in:
Dragorn421 2022-10-23 06:49:56 +02:00
parent 63d549465b
commit 3ac4a29059
No known key found for this signature in database
GPG key ID: 32B53D2D16FC4118
2 changed files with 11 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
include/z64.h
View file

@ -763,16 +763,16 @@ typedef enum {
/* 5 */ PAUSE_STATE_OPENING_2, // Finish some animations for opening the menu.
/* 6 */ PAUSE_STATE_MAIN, // Pause menu ready for player inputs.
/* 7 */ PAUSE_STATE_SAVE_PROMPT, // Save prompt in the pause menu
/* 8 */ PAUSE_STATE_8, // saveGameOver
/* 9 */ PAUSE_STATE_9, // saveGameOver
/* 10 */ PAUSE_STATE_10, // game over saveGameOver
/* 11 */ PAUSE_STATE_11, // game over KaleidoScope_DrawGameOver saveGameOver
/* 12 */ PAUSE_STATE_12, // game over KaleidoScope_DrawGameOver saveGameOver
/* 13 */ PAUSE_STATE_13, // game over KaleidoScope_DrawGameOver saveGameOver
/* 14 */ PAUSE_STATE_14, // game over KaleidoScope_DrawGameOver saveGameOver
/* 15 */ PAUSE_STATE_15, // game over KaleidoScope_DrawGameOver saveGameOver
/* 16 */ PAUSE_STATE_16, // game over KaleidoScope_DrawGameOver saveGameOver
/* 17 */ PAUSE_STATE_17, // game over KaleidoScope_DrawGameOver saveGameOver
/* 8 */ PAUSE_STATE_8,
/* 9 */ PAUSE_STATE_9,
/* 10 */ PAUSE_STATE_10,
/* 11 */ PAUSE_STATE_11,
/* 12 */ PAUSE_STATE_12,
/* 13 */ PAUSE_STATE_13,
/* 14 */ PAUSE_STATE_14,
/* 15 */ PAUSE_STATE_15,
/* 16 */ PAUSE_STATE_16,
/* 17 */ PAUSE_STATE_17,
/* 18 */ PAUSE_STATE_CLOSING, // Animate the pause menu closing
/* 19 */ PAUSE_STATE_UNPAUSE
} PauseState;

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

@ -960,12 +960,7 @@ void KaleidoScope_DrawPages(PlayState* play, GraphicsContext* gfxCtx) {
OPEN_DISPS(gfxCtx, "../z_kaleido_scope_PAL.c", 1100);
if ((pauseCtx->state < PAUSE_STATE_8)
/* PAUSE_STATE_OFF, PAUSE_STATE_WAIT_LETTERBOX, PAUSE_STATE_WAIT_BG_PRERENDER, PAUSE_STATE_INIT,
PAUSE_STATE_OPENING_1, PAUSE_STATE_OPENING_2, PAUSE_STATE_MAIN, PAUSE_STATE_SAVE_PROMPT */
|| (pauseCtx->state >= PAUSE_STATE_CLOSING)
/* PAUSE_STATE_CLOSING, PAUSE_STATE_UNPAUSE */
) {
if (!IS_PAUSE_STATE_GAMEOVER(pauseCtx)) {
if (pauseCtx->state != PAUSE_STATE_SAVE_PROMPT) {
stepR = ABS(sColor82ABRed_D_8082AB8C -
sCursorColors_D_8082ACF4[pauseCtx->cursorColorSet + sCursorColorBlinkOffset_D_8082AD40][0]) /