Game-Decompilation/2ship2harkinian
1
0
Fork 0
mirror of https://github.com/HarbourMasters/2ship2harkinian.git synced 2025-02-11 09:25:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix cremia text crash. (#235)

Browse Source
This commit is contained in:
louist103 2024-04-24 23:47:31 -04:00 committed by Garrett Cox
parent aac00dd71a
commit 3ad053807e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mm/include/z64message.h
View File

@ -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;

2
mm/src/code/z_message.c
View File

@ -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];