1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-16 12:54:40 +00:00

Match NTSC z_kanfont.c and z_message.c (#1997)

* Match NTSC z_kanfont.c and z_message.c

Co-authored-by: inspectredc <inspectredc@gmail.com>

* Apply suggestions from code review

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>

* Remove now-unnecessary padding

* Remove msgBufDecoded comment

* Use == NULL for fake match

* Rename Message_DrawText{JPN,NES} -> Message_DrawText[Wide]

* Font_LoadKanji -> Font_LoadCharWide

* Restore FONT_MESSAGE_OFFSET/FONT_MESSAGE_LENGTH

---------

Co-authored-by: inspectredc <inspectredc@gmail.com>
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
This commit is contained in:
cadmic 2024-07-21 18:50:20 -07:00 committed by GitHub
parent ab2ca85227
commit 47fd023238
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 1259 additions and 402 deletions

View file

@ -75,6 +75,38 @@
#define MESSAGE_WIDE_HIGHSCORE 0x869F
#define MESSAGE_WIDE_TIME 0x81A1
/*
* Message character constants
*/
// Non-Wide (nes/ger/fra)
#define MESSAGE_CHAR_SPACE 0x20 // ' '
// Wide (jpn)
#define MESSAGE_WIDE_CHAR_SPACE 0x8140 // ' '
#define MESSAGE_WIDE_CHAR_TOUTEN 0x8141 // '、'
#define MESSAGE_WIDE_CHAR_KUTEN 0x8142 // '。'
#define MESSAGE_WIDE_CHAR_PERIOD 0x8144 // ''
#define MESSAGE_WIDE_CHAR_NAKATEN 0x8145 // '・'
#define MESSAGE_WIDE_CHAR_QUESTION_MARK 0x8148 // ''
#define MESSAGE_WIDE_CHAR_EXCLAMATION_MARK 0x8149 // ''
#define MESSAGE_WIDE_CHAR_CIRCUMFLEX_ACCENT 0x814F // ''
#define MESSAGE_WIDE_CHAR_DOUBLE_QUOTATION_MARK_LEFT 0x8167 // '“'
#define MESSAGE_WIDE_CHAR_DOUBLE_QUOTATION_MARK_RIGHT 0x8168 // '”'
#define MESSAGE_WIDE_CHAR_PARENTHESES_LEFT 0x8169 // ''
#define MESSAGE_WIDE_CHAR_PARENTHESES_RIGHT 0x816A // ''
#define MESSAGE_WIDE_CHAR_KAGIKAKKO_LEFT 0x8175 // '「'
#define MESSAGE_WIDE_CHAR_KAGIKAKKO_RIGHT 0x8176 // '」'
#define MESSAGE_WIDE_CHAR_NUMBER_SIGN 0x8194 // ''
#define MESSAGE_WIDE_CHAR_ASTERISK 0x8196 // ''
#define MESSAGE_WIDE_CHAR_ZERO 0x824F // ''
#define MESSAGE_WIDE_CHAR_ONE 0x8250 // ''
#define MESSAGE_WIDE_CHAR_HOURS 0x8E9E // '時'
#define MESSAGE_WIDE_CHAR_SECONDS 0x9562 // '秒'
#define MESSAGE_WIDE_CHAR_MINUTES 0x95AA // '分'
/*
* Colors
*/