mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-12 19:04:38 +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

6
src/code/z_bgcheck.c
View file

@ -3154,7 +3154,7 @@ f32 BgCheck_RaycastDownDyna(DynaRaycastDown* dynaRaycastDown) {
f32 result;
f32 intersect2;
s32 i2;
s32 pauseState;
s32 isPaused;
DynaPolyActor* dynaActor;
s32 pad;
Vec3f polyVtx[3];
@ -3223,8 +3223,8 @@ f32 BgCheck_RaycastDownDyna(DynaRaycastDown* dynaRaycastDown) {
dynaActor = DynaPoly_GetActor(dynaRaycastDown->colCtx, *dynaRaycastDown->bgId);
if ((result != BGCHECK_Y_MIN) && (dynaActor != NULL) && (dynaRaycastDown->play != NULL)) {
pauseState = IS_PAUSED(&dynaRaycastDown->play->pauseCtx);
if (!pauseState && (dynaRaycastDown->colCtx->dyna.bgActorFlags[*dynaRaycastDown->bgId] & BGACTOR_1)) {
isPaused = IS_PAUSED(&dynaRaycastDown->play->pauseCtx);
if (!isPaused && (dynaRaycastDown->colCtx->dyna.bgActorFlags[*dynaRaycastDown->bgId] & BGACTOR_1)) {
curTransform = &dynaRaycastDown->dyna->bgActors[*dynaRaycastDown->bgId].curTransform;
polyMin =
&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)) {
// The start button was pressed, pause
gSaveContext.prevHudVisibilityMode = gSaveContext.hudVisibilityMode;
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);
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 */
switch (play->sceneId) {
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];
u32 size;
void* ptr;