From 0514d963d9fcf16cc77f39880445db5271766b3d Mon Sep 17 00:00:00 2001 From: Derek Hensley Date: Sat, 12 Oct 2024 17:03:44 -0700 Subject: Port over OoT's new text pipeline (#1685) * Port OoT's new msgdis and msgenc * format * Remove item_ids try block * Update assets/text/charmap.txt Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com> --------- Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com> --- src/code/z_message.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/code') diff --git a/src/code/z_message.c b/src/code/z_message.c index d423e347b..2bbca1725 100644 --- a/src/code/z_message.c +++ b/src/code/z_message.c @@ -55,7 +55,7 @@ u16 gBombersNotebookWeekEventFlags[BOMBERS_NOTEBOOK_EVENT_MAX] = { #undef DEFINE_PERSON #undef DEFINE_EVENT -#define DEFINE_MESSAGE(textId, typePos, msg) { textId, typePos, _message_##textId }, +#define DEFINE_MESSAGE(textId, type, yPos, msg) { textId, (((type)&0xF) << 4) | ((yPos)&0xF), _message_##textId }, MessageTableEntry sMessageTableNES[] = { #include "assets/text/message_data.h" @@ -64,10 +64,11 @@ MessageTableEntry sMessageTableNES[] = { #undef DEFINE_MESSAGE -#define DEFINE_MESSAGE(textId, typePos, msg) { textId, typePos, _message_##textId##_staff }, +#define DEFINE_MESSAGE(textId, type, yPos, msg) \ + { textId, (((type)&0xF) << 4) | ((yPos)&0xF), _message_##textId##_staff }, MessageTableEntry sMessageTableCredits[] = { -#include "assets/text/staff_message_data.h" +#include "assets/text/message_data_staff.h" { 0xFFFF, 0, NULL }, }; -- cgit v1.2.3