summaryrefslogtreecommitdiff
path: root/src/code/z_play.c
diff options
context:
space:
mode:
authorDerek Hensley <hensley.derek58@gmail.com>2023-09-24 01:46:07 -0700
committerGitHub <noreply@github.com>2023-09-24 18:46:07 +1000
commit2e87212038a4abe3c66d20b98d6f1c2fff8f2380 (patch)
tree1083df7a1d55514a6a5e6b07c45ca002c3ff680c /src/code/z_play.c
parent3d3ca570221bc9cafd07d0d1affcc44bab8c84b7 (diff)
z_message_staff (1 NON-MATCHING) (#1376)
* z_message_staff from z_message branch * Use highscores array * Clean up * format * PR cleanup * PR Review * Fix bss * Fix bss
Diffstat (limited to 'src/code/z_play.c')
-rw-r--r--src/code/z_play.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/code/z_play.c b/src/code/z_play.c
index 9bb8d5817..44efbfbfb 100644
--- a/src/code/z_play.c
+++ b/src/code/z_play.c
@@ -961,9 +961,9 @@ void Play_UpdateMain(PlayState* this) {
Play_UpdateTransition(this);
if (gTransitionTileState != TRANS_TILE_READY) {
if ((gSaveContext.gameMode == GAMEMODE_NORMAL) &&
- (((this->msgCtx.msgMode == 0)) ||
- ((this->msgCtx.currentTextId == 0xFF) && (this->msgCtx.msgMode == 0x42) &&
- (this->msgCtx.unk12020 == 0x41)) ||
+ (((this->msgCtx.msgMode == MSGMODE_NONE)) ||
+ ((this->msgCtx.currentTextId == 0xFF) && (this->msgCtx.msgMode == MSGMODE_TEXT_DONE) &&
+ (this->msgCtx.textboxEndType == TEXTBOX_ENDTYPE_41)) ||
((this->msgCtx.currentTextId >= 0x100) && (this->msgCtx.currentTextId <= 0x200))) &&
(this->gameOverCtx.state == GAMEOVER_INACTIVE)) {
KaleidoSetup_Update(this);