diff options
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_message.c | 7 |
1 files changed, 4 insertions, 3 deletions
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 }, }; |