mirror of
https://github.com/zeldaret/mm.git
synced 2026-06-21 15:56:42 -04:00
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>
This commit is contained in:
@@ -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 },
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user