diff options
| author | Dragorn421 <Dragorn421@users.noreply.github.com> | 2024-03-02 04:09:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-01 22:09:57 -0500 |
| commit | a6f646dc659eb1711901fc05d82704b34a9c23fd (patch) | |
| tree | 9730ffaa09f89aa0e4c43e065cb1292d7377b0cf /src/code | |
| parent | ca45c543f65acda1ba2ed77caed6c6a85d790af0 (diff) | |
Introduce extracted/VERSION, with text extracted there (#1730)
* Introduce assets/_extracted/VERSION, with text extracted there
* move to `extracted/text/`
* Update gitignore s
* rework args for msgenc.py
* put mkdir with others, until theyre all moved at once
* move 0xFFFC back to being extracted, making it use specific macro `DEFINE_MESSAGE_NES` to handle its special behavior
* prettier gitignore
* Move messages 0xFFFC, 0xFFFD to committed message_data.h
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_message_PAL.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/code/z_message_PAL.c b/src/code/z_message_PAL.c index 03db0dc18..f63b41052 100644 --- a/src/code/z_message_PAL.c +++ b/src/code/z_message_PAL.c @@ -30,24 +30,28 @@ u16 sOcarinaSongBitFlags = 0; // ocarina bit flags MessageTableEntry sNesMessageEntryTable[] = { #define DEFINE_MESSAGE(textId, type, yPos, nesMessage, gerMessage, fraMessage) \ { textId, (_SHIFTL(type, 4, 8) | _SHIFTL(yPos, 0, 8)), _message_##textId##_nes }, -#define DEFINE_MESSAGE_FFFC +#define DEFINE_MESSAGE_NES(textId, type, yPos, nesMessage) DEFINE_MESSAGE(textId, type, yPos, nesMessage, , ) #include "assets/text/message_data.h" -#undef DEFINE_MESSAGE_FFFC #undef DEFINE_MESSAGE +#undef DEFINE_MESSAGE_NES { 0xFFFF, 0, NULL }, }; const char* sGerMessageEntryTable[] = { #define DEFINE_MESSAGE(textId, type, yPos, nesMessage, gerMessage, fraMessage) _message_##textId##_ger, +#define DEFINE_MESSAGE_NES(textId, type, yPos, nesMessage) #include "assets/text/message_data.h" #undef DEFINE_MESSAGE +#undef DEFINE_MESSAGE_NES NULL, }; const char* sFraMessageEntryTable[] = { #define DEFINE_MESSAGE(textId, type, yPos, nesMessage, gerMessage, fraMessage) _message_##textId##_fra, +#define DEFINE_MESSAGE_NES(textId, type, yPos, nesMessage) #include "assets/text/message_data.h" #undef DEFINE_MESSAGE +#undef DEFINE_MESSAGE_NES NULL, }; |