diff options
| author | cadmic <cadmic24@gmail.com> | 2024-07-21 18:50:20 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-21 21:50:20 -0400 |
| commit | 47fd0232389eebcf883f58bdbc2002abd4e3ad18 (patch) | |
| tree | 81f2ca8a0d0c27e704505e6b1026c07b5294bcdb /tools/disasm | |
| parent | ab2ca85227bb4ed245d3a39faedc25f793a39a45 (diff) | |
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>
Diffstat (limited to 'tools/disasm')
| -rw-r--r-- | tools/disasm/gc-us/functions.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/disasm/gc-us/functions.txt b/tools/disasm/gc-us/functions.txt index 6a84ee67b..5300b4ed5 100644 --- a/tools/disasm/gc-us/functions.txt +++ b/tools/disasm/gc-us/functions.txt @@ -1169,7 +1169,7 @@ Jpeg_Decode = 0x8005B1AC; // type:func KaleidoSetup_Update = 0x8005B4E0; // type:func KaleidoSetup_Init = 0x8005B74C; // type:func KaleidoSetup_Destroy = 0x8005B8A0; // type:func -func_8006EE50 = 0x8005B8B0; // type:func +Font_LoadCharWide = 0x8005B8B0; // type:func Font_LoadChar = 0x8005B904; // type:func Font_LoadMessageBoxIcon = 0x8005B954; // type:func Font_LoadOrderedFont = 0x8005B998; // type:func @@ -3072,8 +3072,8 @@ Message_SetTextColor = 0x800D7514; // type:func Message_DrawTextboxIcon = 0x800D77C8; // type:func Message_DrawItemIcon = 0x800D7F0C; // type:func Message_HandleOcarina = 0x800D8258; // type:func -Message_DrawTextJPN = 0x800D8468; // type:func -Message_DrawTextNES = 0x800D985C; // type:func +Message_DrawTextWide = 0x800D8468; // type:func +Message_DrawText = 0x800D985C; // type:func Message_LoadItemIcon = 0x800DAAD4; // type:func Message_Decode = 0x800DAC74; // type:func Message_OpenText = 0x800DD19C; // type:func |