diff options
| author | Dragorn421 <Dragorn421@users.noreply.github.com> | 2024-09-04 22:48:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-04 16:48:10 -0400 |
| commit | c7b55f9a072359d3c28b9cfca2d20e2fc23b35a4 (patch) | |
| tree | 06ebd233ccb1e45844e830caf7f1c46298da59cd /src/code | |
| parent | 376f9852d088003b5e1cc15e599131991de20516 (diff) | |
Fix merge issue between z_message.c match and n64dd renames (#2131)
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_message.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/code/z_message.c b/src/code/z_message.c index a61c1620b..0f42e5e82 100644 --- a/src/code/z_message.c +++ b/src/code/z_message.c @@ -2461,7 +2461,7 @@ void Message_OpenText(PlayState* play, u16 textId) { Message_FindCreditsMessage(play, textId); msgCtx->msgLength = font->msgLength; #if PLATFORM_N64 - if ((B_80121AF0 != NULL) && (B_80121AF0->unk_60 != NULL) && B_80121AF0->unk_60(&play->msgCtx.font)) { + if ((B_80121220 != NULL) && (B_80121220->unk_60 != NULL) && B_80121220->unk_60(&play->msgCtx.font)) { } else { DmaMgr_RequestSync(font->msgBuf, (uintptr_t)_staff_message_data_staticSegmentRomStart + font->msgOffset, @@ -2477,7 +2477,7 @@ void Message_OpenText(PlayState* play, u16 textId) { Message_FindMessageJPN(play, textId); msgCtx->msgLength = font->msgLength; #if PLATFORM_N64 - if ((B_80121AF0 != NULL) && (B_80121AF0->unk_64 != NULL) && B_80121AF0->unk_64(&play->msgCtx.font)) { + if ((B_80121220 != NULL) && (B_80121220->unk_64 != NULL) && B_80121220->unk_64(&play->msgCtx.font)) { } else { DmaMgr_RequestSync(font->msgBuf, (uintptr_t)_jpn_message_data_staticSegmentRomStart + font->msgOffset, @@ -2491,7 +2491,7 @@ void Message_OpenText(PlayState* play, u16 textId) { Message_FindMessageNES(play, textId); msgCtx->msgLength = font->msgLength; #if PLATFORM_N64 - if ((B_80121AF0 != NULL) && (B_80121AF0->unk_68 != NULL) && B_80121AF0->unk_68(&play->msgCtx.font)) { + if ((B_80121220 != NULL) && (B_80121220->unk_68 != NULL) && B_80121220->unk_68(&play->msgCtx.font)) { } else { DmaMgr_RequestSync(font->msgBuf, (uintptr_t)_nes_message_data_staticSegmentRomStart + font->msgOffset, @@ -4278,8 +4278,8 @@ void Message_SetTables(void) { sStaffMessageEntryTablePtr = sStaffMessageEntryTable; #if PLATFORM_N64 - if ((B_80121AF0 != NULL) && (B_80121AF0->unk_58 != NULL)) { - B_80121AF0->unk_58(&sJpnMessageEntryTablePtr, &sNesMessageEntryTablePtr, &sStaffMessageEntryTablePtr); + if ((B_80121220 != NULL) && (B_80121220->unk_58 != NULL)) { + B_80121220->unk_58(&sJpnMessageEntryTablePtr, &sNesMessageEntryTablePtr, &sStaffMessageEntryTablePtr); } #endif } |