Skip to content

Name message start frame count variable #2673

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Dragorn421 merged 1 commit into from
Feb 14, 2026
Merged

Name message start frame count variable #2673

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/code/z_message.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ s32 sCharTexScale;

s16 sTextFade = false; // original name: key_off_flag ?

char D_8014B2F4 = 0;
char sMessageStartFrameCount = 0;

s16 sOcarinaButtonIndexBufPos = 0;

Expand Down Expand Up @@ -2559,7 +2559,7 @@ void Message_OpenText(PlayState* play, u16 textId) {
Interface_ChangeHudVisibilityMode(HUD_VISIBILITY_A_HEARTS_MAGIC_FORCE);
}

sMessageHasSetSfx = D_8014B2F4 = sTextboxSkipped = sTextIsCredits = 0;
sMessageHasSetSfx = sMessageStartFrameCount = sTextboxSkipped = sTextIsCredits = 0;

if (textId >= 0x0500 && textId < 0x0600) { // text ids 0500 to 0600 are reserved for credits
sTextIsCredits = true;
Expand Down Expand Up @@ -4154,17 +4154,17 @@ void Message_Update(PlayState* play) {

switch (msgCtx->msgMode) {
case MSGMODE_TEXT_START:
D_8014B2F4++;
sMessageStartFrameCount++;

var = false;
if (R_SCENE_CAM_TYPE == SCENE_CAM_TYPE_FIXED_MARKET) {
if (D_8014B2F4 >= 4) {
if (sMessageStartFrameCount >= 4) {
var = true;
}
} else if (R_SCENE_CAM_TYPE != SCENE_CAM_TYPE_DEFAULT ||
play->sceneId == SCENE_CASTLE_COURTYARD_GUARDS_DAY) {
var = true;
} else if (D_8014B2F4 >= 4 || msgCtx->talkActor == NULL) {
} else if (sMessageStartFrameCount >= 4 || msgCtx->talkActor == NULL) {
var = true;
}

Expand Down