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

Name pause states except saving/gameover and related/misc docs

Browse source
This commit is contained in:
Dragorn421 2022-08-29 12:10:39 +02:00
parent 5fdf0f529f
commit 4330108a1b
No known key found for this signature in database
GPG key ID: 32B53D2D16FC4118
20 changed files with 272 additions and 223 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/code/z_play.c
View file

@ -443,7 +443,7 @@ void Play_Init(GameState* thisx) {
void Play_Update(PlayState* this) {
s32 pad1;
s32 sp80;
s32 isPaused;
Input* input;
u32 i;
s32 pad2;
@ -838,7 +838,7 @@ void Play_Update(PlayState* this) {
}
PLAY_LOG(3551);
sp80 = (this->pauseCtx.state != PAUSE_STATE_0) || (this->pauseCtx.debugState != 0);
isPaused = (this->pauseCtx.state != PAUSE_STATE_OFF) || (this->pauseCtx.debugState != 0);
PLAY_LOG(3555);
AnimationContext_Reset(&this->animationCtx);
@ -848,7 +848,7 @@ void Play_Update(PlayState* this) {
PLAY_LOG(3577);
if ((sp80 == 0) && (IREG(72) == 0)) {
if (!isPaused && (IREG(72) == 0)) {
PLAY_LOG(3580);
this->gameplayFrames++;
@ -915,7 +915,7 @@ void Play_Update(PlayState* this) {
if (this->viewpoint != VIEWPOINT_NONE) {
if (CHECK_BTN_ALL(input[0].press.button, BTN_CUP)) {
if ((this->pauseCtx.state != PAUSE_STATE_0) || (this->pauseCtx.debugState != 0)) {
if ((this->pauseCtx.state != PAUSE_STATE_OFF) || (this->pauseCtx.debugState != 0)) {
// "Changing viewpoint is prohibited due to the kaleidoscope"
osSyncPrintf(VT_FGCOL(CYAN) "カレイドスコープ中につき視点変更を禁止しております\n" VT_RST);
} else if (Player_InCsMode(this)) {
@ -939,7 +939,7 @@ void Play_Update(PlayState* this) {
PLAY_LOG(3716);
if ((this->pauseCtx.state != PAUSE_STATE_0) || (this->pauseCtx.debugState != 0)) {
if ((this->pauseCtx.state != PAUSE_STATE_OFF) || (this->pauseCtx.debugState != 0)) {
PLAY_LOG(3721);
KaleidoScopeCall_Update(this);
} else if (this->gameOverCtx.state != GAMEOVER_INACTIVE) {
@ -976,7 +976,7 @@ void Play_Update(PlayState* this) {
skip:
PLAY_LOG(3801);
if ((sp80 == 0) || gDbgCamEnabled) {
if (!isPaused || gDbgCamEnabled) {
s32 pad3[5];
s32 i;
@ -1002,7 +1002,7 @@ skip:
}
void Play_DrawOverlayElements(PlayState* this) {
if ((this->pauseCtx.state != PAUSE_STATE_0) || (this->pauseCtx.debugState != 0)) {
if ((this->pauseCtx.state != PAUSE_STATE_OFF) || (this->pauseCtx.debugState != 0)) {
KaleidoScopeCall_Draw(this);
}