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

Merge branch 'master' into doc_pause_menu

Browse source
This commit is contained in:
Dragorn421 2022-10-07 13:47:12 +02:00
commit 306dbb68cc
No known key found for this signature in database
GPG key ID: 32B53D2D16FC4118
191 changed files with 4575 additions and 3678 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/code/z_play.c
View file

@ -175,7 +175,7 @@ void Play_Destroy(GameState* thisx) {
Player* player = GET_PLAYER(this);
this->state.gfxCtx->callback = NULL;
this->state.gfxCtx->callbackParam = 0;
this->state.gfxCtx->callbackParam = NULL;
SREG(91) = 0;
R_PAUSE_BG_PRERENDER_STATE = PAUSE_BG_PRERENDER_OFF;
@ -852,7 +852,7 @@ void Play_Update(PlayState* this) {
PLAY_LOG(3580);
this->gameplayFrames++;
func_800AA178(1);
Rumble_SetUpdateEnabled(true);
if (this->actorCtx.freezeFlashTimer && (this->actorCtx.freezeFlashTimer-- < 5)) {
osSyncPrintf("FINISH=%d\n", this->actorCtx.freezeFlashTimer);
@ -902,7 +902,7 @@ void Play_Update(PlayState* this) {
PLAY_LOG(3662);
}
} else {
func_800AA178(0);
Rumble_SetUpdateEnabled(false);
}
PLAY_LOG(3672);