From 3ad053807e1e0fff563974d34a8852e17edc84e6 Mon Sep 17 00:00:00 2001
From: louist103 <35883445+louist103@users.noreply.github.com>
Date: Wed, 24 Apr 2024 23:47:31 -0400
Subject: [PATCH] Fix cremia text crash. (#235)

---
 mm/include/z64message.h | 2 +-
 mm/src/code/z_message.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mm/include/z64message.h b/mm/include/z64message.h
index 34360fe72..8584366c9 100644
--- a/mm/include/z64message.h
+++ b/mm/include/z64message.h
@@ -195,7 +195,7 @@ typedef struct {
         u64 force_structure_alignment_font;
     };
     /* 0x11880 */ union {
-        char schar[1280]; // msgBuf
+        unsigned char schar[1280]; // msgBuf
         u16 wchar[640];   // msgBufWide
         u64 force_structure_alignment_msg;
     } msgBuf;
diff --git a/mm/src/code/z_message.c b/mm/src/code/z_message.c
index a74ba2a4d..8d5d3e4c8 100644
--- a/mm/src/code/z_message.c
+++ b/mm/src/code/z_message.c
@@ -2160,7 +2160,7 @@ void Message_SetupLoadItemIcon(PlayState* play) {
             msgCtx->itemId = (u8)font->msgBuf.schar[msgCtx->msgBufPos];
         }
         msgCtx->nextTextId = font->msgBuf.schar[++msgCtx->msgBufPos] << 8;
-        msgCtx->nextTextId |= font->msgBuf.schar[++msgCtx->msgBufPos];
+        msgCtx->nextTextId += font->msgBuf.schar[++msgCtx->msgBufPos];
 
         msgCtx->unk1206C = (u8)(font->msgBuf.schar[++msgCtx->msgBufPos] << 8);
         msgCtx->unk1206C |= font->msgBuf.schar[++msgCtx->msgBufPos];