mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-04 23:14:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit 'd314cfe923' into doc_pause_menu

Browse source
This commit is contained in:
Dragorn421 2023-09-20 21:49:59 +02:00
commit 74b74eb006
No known key found for this signature in database
GPG key ID: 381AEBAF3D429335
8 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/functions.h
View file

@ -1039,7 +1039,7 @@ s32 Player_OverrideLimbDrawGameplayCrawling(PlayState* play, s32 limbIndex, Gfx*
u8 func_80090480(PlayState* play, ColliderQuad* collider, WeaponInfo* weaponInfo, Vec3f* newTip, Vec3f* newBase); u8 func_80090480(PlayState* play, ColliderQuad* collider, WeaponInfo* weaponInfo, Vec3f* newTip, Vec3f* newBase);
void Player_DrawGetItem(PlayState* play, Player* this); void Player_DrawGetItem(PlayState* play, Player* this);
void Player_PostLimbDrawGameplay(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx); void Player_PostLimbDrawGameplay(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx);
u32 Player_InitDrawPause(PlayState* play, u8* segment, SkelAnime* skelAnime); u32 Player_InitPauseDrawData(PlayState* play, u8* segment, SkelAnime* skelAnime);
void Player_DrawPause(PlayState* play, u8* segment, SkelAnime* skelAnime, Vec3f* pos, Vec3s* rot, f32 scale, void Player_DrawPause(PlayState* play, u8* segment, SkelAnime* skelAnime, Vec3f* pos, Vec3s* rot, f32 scale,
s32 sword, s32 tunic, s32 shield, s32 boots); s32 sword, s32 tunic, s32 shield, s32 boots);
void PreNMI_Init(GameState* thisx); void PreNMI_Init(GameState* thisx);

2
include/z64pause.h
View file

@ -59,7 +59,7 @@ typedef enum {
/* 16 */ PAUSE_STATE_16, /* 16 */ PAUSE_STATE_16,
/* 17 */ PAUSE_STATE_17, /* 17 */ PAUSE_STATE_17,
/* 18 */ PAUSE_STATE_CLOSING, // Animate the pause menu closing /* 18 */ PAUSE_STATE_CLOSING, // Animate the pause menu closing
/* 19 */ PAUSE_STATE_UNPAUSE /* 19 */ PAUSE_STATE_RESUME_GAMEPLAY // Handles returning to normal gameplay once the pause menu is visually closed
} PauseState; } PauseState;
#define IS_PAUSE_STATE_GAMEOVER(pauseCtx) \ #define IS_PAUSE_STATE_GAMEOVER(pauseCtx) \

6
src/code/z_bgcheck.c
View file

@ -3154,7 +3154,7 @@ f32 BgCheck_RaycastDownDyna(DynaRaycastDown* dynaRaycastDown) {
f32 result; f32 result;
f32 intersect2; f32 intersect2;
s32 i2; s32 i2;
s32 pauseState; s32 isPaused;
DynaPolyActor* dynaActor; DynaPolyActor* dynaActor;
s32 pad; s32 pad;
Vec3f polyVtx[3]; Vec3f polyVtx[3];
@ -3223,8 +3223,8 @@ f32 BgCheck_RaycastDownDyna(DynaRaycastDown* dynaRaycastDown) {
dynaActor = DynaPoly_GetActor(dynaRaycastDown->colCtx, *dynaRaycastDown->bgId); dynaActor = DynaPoly_GetActor(dynaRaycastDown->colCtx, *dynaRaycastDown->bgId);
if ((result != BGCHECK_Y_MIN) && (dynaActor != NULL) && (dynaRaycastDown->play != NULL)) { if ((result != BGCHECK_Y_MIN) && (dynaActor != NULL) && (dynaRaycastDown->play != NULL)) {
pauseState = IS_PAUSED(&dynaRaycastDown->play->pauseCtx); isPaused = IS_PAUSED(&dynaRaycastDown->play->pauseCtx);
if (!pauseState && (dynaRaycastDown->colCtx->dyna.bgActorFlags[*dynaRaycastDown->bgId] & BGACTOR_1)) { if (!isPaused && (dynaRaycastDown->colCtx->dyna.bgActorFlags[*dynaRaycastDown->bgId] & BGACTOR_1)) {
curTransform = &dynaRaycastDown->dyna->bgActors[*dynaRaycastDown->bgId].curTransform; curTransform = &dynaRaycastDown->dyna->bgActors[*dynaRaycastDown->bgId].curTransform;
polyMin = polyMin =
&dynaRaycastDown->dyna &dynaRaycastDown->dyna

1
src/code/z_kaleido_setup.c
View file

@ -55,7 +55,6 @@ void KaleidoSetup_Update(PlayState* play) {
} }
} else if (CHECK_BTN_ALL(input->press.button, BTN_START)) { } else if (CHECK_BTN_ALL(input->press.button, BTN_START)) {
// The start button was pressed, pause // The start button was pressed, pause
gSaveContext.prevHudVisibilityMode = gSaveContext.hudVisibilityMode; gSaveContext.prevHudVisibilityMode = gSaveContext.hudVisibilityMode;
R_PAUSE_CURSOR_LEFT_X = -175; R_PAUSE_CURSOR_LEFT_X = -175;

2
src/code/z_map_exp.c
View file

@ -365,7 +365,7 @@ void Minimap_Draw(PlayState* play) {
OPEN_DISPS(play->state.gfxCtx, "../z_map_exp.c", 626); OPEN_DISPS(play->state.gfxCtx, "../z_map_exp.c", 626);
if (play->pauseCtx.state < PAUSE_STATE_OPENING_1) { if (play->pauseCtx.state <= PAUSE_STATE_INIT) {
/* PAUSE_STATE_OFF, PAUSE_STATE_WAIT_LETTERBOX, PAUSE_STATE_WAIT_BG_PRERENDER, PAUSE_STATE_INIT */ /* PAUSE_STATE_OFF, PAUSE_STATE_WAIT_LETTERBOX, PAUSE_STATE_WAIT_BG_PRERENDER, PAUSE_STATE_INIT */
switch (play->sceneId) { switch (play->sceneId) {
case SCENE_DEKU_TREE: case SCENE_DEKU_TREE:

2
src/code/z_player_lib.c
View file

@ -1641,7 +1641,7 @@ void Player_PostLimbDrawGameplay(PlayState* play, s32 limbIndex, Gfx** dList, Ve
} }
} }
u32 Player_InitDrawPause(PlayState* play, u8* segment, SkelAnime* skelAnime) { u32 Player_InitPauseDrawData(PlayState* play, u8* segment, SkelAnime* skelAnime) {
s16 linkObjectId = gLinkObjectIds[(void)0, gSaveContext.save.linkAge]; s16 linkObjectId = gLinkObjectIds[(void)0, gSaveContext.save.linkAge];
u32 size; u32 size;
void* ptr; void* ptr;

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

@ -2702,7 +2702,7 @@ void KaleidoScope_SetVertices(PlayState* play, GraphicsContext* gfxCtx) {
if ((pauseCtx->state == PAUSE_STATE_OPENING_1) || if ((pauseCtx->state == PAUSE_STATE_OPENING_1) ||
(pauseCtx->state >= PAUSE_STATE_CLOSING (pauseCtx->state >= PAUSE_STATE_CLOSING
/* PAUSE_STATE_CLOSING, PAUSE_STATE_UNPAUSE */) || /* PAUSE_STATE_CLOSING, PAUSE_STATE_RESUME_GAMEPLAY */) ||
((pauseCtx->state == PAUSE_STATE_SAVE_PROMPT) && ((pauseCtx->state == PAUSE_STATE_SAVE_PROMPT) &&
((pauseCtx->savePromptState == PAUSE_SAVE_PROMPT_STATE_CLOSING) || ((pauseCtx->savePromptState == PAUSE_SAVE_PROMPT_STATE_CLOSING) ||
(pauseCtx->savePromptState == PAUSE_SAVE_PROMPT_STATE_CLOSING_AFTER_SAVED))) || (pauseCtx->savePromptState == PAUSE_SAVE_PROMPT_STATE_CLOSING_AFTER_SAVED))) ||
@ -3525,7 +3525,7 @@ void KaleidoScope_Update(PlayState* play) {
pauseCtx->playerSegment = (void*)(((uintptr_t)play->objectCtx.spaceStart + 0x30) & ~0x3F); pauseCtx->playerSegment = (void*)(((uintptr_t)play->objectCtx.spaceStart + 0x30) & ~0x3F);
playerSegmentDrawPauseSize = playerSegmentDrawPauseSize =
Player_InitDrawPause(play, pauseCtx->playerSegment, &pauseCtx->playerSkelAnime); Player_InitPauseDrawData(play, pauseCtx->playerSegment, &pauseCtx->playerSkelAnime);
osSyncPrintf("プレイヤー size1＝%x\n", playerSegmentDrawPauseSize); osSyncPrintf("プレイヤー size1＝%x\n", playerSegmentDrawPauseSize);
pauseCtx->iconItemSegment = (void*)ALIGN16((uintptr_t)pauseCtx->playerSegment + playerSegmentDrawPauseSize); pauseCtx->iconItemSegment = (void*)ALIGN16((uintptr_t)pauseCtx->playerSegment + playerSegmentDrawPauseSize);
@ -4129,7 +4129,7 @@ void KaleidoScope_Update(PlayState* play) {
} }
} else { } else {
pauseCtx->debugState = 0; pauseCtx->debugState = 0;
pauseCtx->state = PAUSE_STATE_UNPAUSE; pauseCtx->state = PAUSE_STATE_RESUME_GAMEPLAY;
pauseCtx->itemPageRoll = pauseCtx->equipPageRoll = pauseCtx->mapPageRoll = pauseCtx->itemPageRoll = pauseCtx->equipPageRoll = pauseCtx->mapPageRoll =
pauseCtx->questPageRoll = 160.0f; pauseCtx->questPageRoll = 160.0f;
pauseCtx->namedItem = PAUSE_ITEM_NONE; pauseCtx->namedItem = PAUSE_ITEM_NONE;
@ -4452,7 +4452,7 @@ void KaleidoScope_Update(PlayState* play) {
} }
} else { } else {
pauseCtx->debugState = 0; pauseCtx->debugState = 0;
pauseCtx->state = PAUSE_STATE_UNPAUSE; pauseCtx->state = PAUSE_STATE_RESUME_GAMEPLAY;
pauseCtx->itemPageRoll = pauseCtx->equipPageRoll = pauseCtx->mapPageRoll = pauseCtx->questPageRoll = pauseCtx->itemPageRoll = pauseCtx->equipPageRoll = pauseCtx->mapPageRoll = pauseCtx->questPageRoll =
160.0f; 160.0f;
pauseCtx->namedItem = PAUSE_ITEM_NONE; pauseCtx->namedItem = PAUSE_ITEM_NONE;
@ -4460,7 +4460,7 @@ void KaleidoScope_Update(PlayState* play) {
} }
break; break;
case PAUSE_STATE_UNPAUSE: case PAUSE_STATE_RESUME_GAMEPLAY:
pauseCtx->state = PAUSE_STATE_OFF; pauseCtx->state = PAUSE_STATE_OFF;
R_UPDATE_RATE = 3; R_UPDATE_RATE = 3;
R_PAUSE_BG_PRERENDER_STATE = PAUSE_BG_PRERENDER_OFF; R_PAUSE_BG_PRERENDER_STATE = PAUSE_BG_PRERENDER_OFF;

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

@ -81,7 +81,7 @@ void PauseMapMark_DrawForDungeon(PlayState* play) {
Matrix_Push(); Matrix_Push();
if ((play->pauseCtx.state == PAUSE_STATE_OPENING_1) || (play->pauseCtx.state >= PAUSE_STATE_CLOSING) if ((play->pauseCtx.state == PAUSE_STATE_OPENING_1) || (play->pauseCtx.state >= PAUSE_STATE_CLOSING)
/* PAUSE_STATE_CLOSING, PAUSE_STATE_UNPAUSE */ /* PAUSE_STATE_CLOSING, PAUSE_STATE_RESUME_GAMEPLAY */
) { ) {
Matrix_Translate(-36.0f, 101.0f, 0.0f, MTXMODE_APPLY); Matrix_Translate(-36.0f, 101.0f, 0.0f, MTXMODE_APPLY);
} else { } else {