falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix errors

This commit is contained in:
JordanLongstaff 2025-12-02 08:57:21 -05:00
parent a8cc82f5bc
commit e8f60f0709
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/z64message.h
View File

@ -290,7 +290,7 @@ typedef struct MessageContext {
/* 0x120D2 */ s16 unk120D2;
/* 0x120D4 */ s16 unk120D4;
/* 0x120D6 */ s16 unk120D6;
/* 0x120D8 */ s16 numLines;
/* 0x120D8 */ s16 lineCount;
/* 0x120DA */ UNK_TYPE1 unk_120DA[0x6];
} MessageContext; // size = 0x120E0

12
src/code/z_message_nes.c
View File

@ -549,7 +549,7 @@ void Message_DrawTextNES(PlayState* play, Gfx** gfxP, u16 textDrawPos) {
msgCtx->textPosX += 50;
}
} else if (msgCtx->choiceNum == 2) {
if (msgCtx->numLines != 3) {
if (msgCtx->lineCount != 3) {
if (!play->pauseCtx.bombersNotebookOpen) {
msgCtx->textPosX += 10;
} else {
@ -746,7 +746,7 @@ void Message_DrawTextNES(PlayState* play, Gfx** gfxP, u16 textDrawPos) {
msgCtx->choiceTextId = msgCtx->currentTextId;
msgCtx->stateTimer = 4;
Font_LoadMessageBoxEndIcon(font, 2);
if (msgCtx->numLines != 3) {
if (msgCtx->lineCount != 3) {
msgCtx->unk11FFE[0] = (s16)(msgCtx->textboxYTarget + 14);
msgCtx->unk11FFE[1] = (s16)(msgCtx->textboxYTarget + 26);
msgCtx->unk11FFE[2] = (s16)(msgCtx->textboxYTarget + 38);
@ -761,7 +761,7 @@ void Message_DrawTextNES(PlayState* play, Gfx** gfxP, u16 textDrawPos) {
msgCtx->choiceTextId = msgCtx->currentTextId;
msgCtx->stateTimer = 4;
Font_LoadMessageBoxEndIcon(font, 2);
if (msgCtx->numLines != 3) {
if (msgCtx->lineCount != 3) {
msgCtx->unk11FFE[0] = (s16)(msgCtx->textboxYTarget + 14);
msgCtx->unk11FFE[1] = (s16)(msgCtx->textboxYTarget + 26);
msgCtx->unk11FFE[2] = (s16)(msgCtx->textboxYTarget + 38);
@ -1100,7 +1100,7 @@ void Message_DecodeNES(PlayState* play) {
}
msgCtx->decodedTextLen = decodedBufPos;
msgCtx->numLines = numLines;
msgCtx->lineCount = numLines;
if (msgCtx->textboxSkipped || (msgCtx->textBoxType == TEXTBOX_TYPE_1) ||
(msgCtx->textBoxType == TEXTBOX_TYPE_3) || (msgCtx->textBoxType == TEXTBOX_TYPE_6) ||
(msgCtx->textBoxType == TEXTBOX_TYPE_8) || (msgCtx->textBoxType == TEXTBOX_TYPE_9) ||
@ -1486,7 +1486,7 @@ void Message_DecodeNES(PlayState* play) {
msgCtx->unk120C4 = charTexIndex;
for (i = 0; i < 5; i++) {
msgCtx->unk12054[i] = 1;
msgCtx->codeGuessDigits[i] = 1;
Message_LoadCharNES(play, '1', &charTexIndex, &spA4, decodedBufPos);
decodedBufPos++;
}
@ -1519,7 +1519,7 @@ void Message_DecodeNES(PlayState* play) {
msgCtx->unk120C4 = charTexIndex;
for (i = 0; i < 3; i++) {
msgCtx->unk12054[i] = 1;
msgCtx->codeGuessDigits[i] = 1;
Font_LoadCharNES(play, '1', charTexIndex);
charTexIndex += FONT_CHAR_TEX_SIZE;
msgCtx->decodedBuffer.schar[decodedBufPos] = '1';