mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-06-08 17:41:56 +00:00
Code Issues Projects Releases Wiki Activity

Fix merge issue between z_message.c match and n64dd renames (#2131)

Browse source
This commit is contained in:
Dragorn421 2024-09-04 22:48:10 +02:00 • committed by GitHub
parent 376f9852d0
commit c7b55f9a07
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/code/z_message.c
View file

@ -2461,7 +2461,7 @@ void Message_OpenText(PlayState* play, u16 textId) {
Message_FindCreditsMessage(play, textId); Message_FindCreditsMessage(play, textId);
msgCtx->msgLength = font->msgLength; msgCtx->msgLength = font->msgLength;
#if PLATFORM_N64 #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 { } else {
DmaMgr_RequestSync(font->msgBuf, (uintptr_t)_staff_message_data_staticSegmentRomStart + font->msgOffset, 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); Message_FindMessageJPN(play, textId);
msgCtx->msgLength = font->msgLength; msgCtx->msgLength = font->msgLength;
#if PLATFORM_N64 #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 { } else {
DmaMgr_RequestSync(font->msgBuf, (uintptr_t)_jpn_message_data_staticSegmentRomStart + font->msgOffset, 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); Message_FindMessageNES(play, textId);
msgCtx->msgLength = font->msgLength; msgCtx->msgLength = font->msgLength;
#if PLATFORM_N64 #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 { } else {
DmaMgr_RequestSync(font->msgBuf, (uintptr_t)_nes_message_data_staticSegmentRomStart + font->msgOffset, DmaMgr_RequestSync(font->msgBuf, (uintptr_t)_nes_message_data_staticSegmentRomStart + font->msgOffset,
@ -4278,8 +4278,8 @@ void Message_SetTables(void) {
sStaffMessageEntryTablePtr = sStaffMessageEntryTable; sStaffMessageEntryTablePtr = sStaffMessageEntryTable;
#if PLATFORM_N64 #if PLATFORM_N64
if ((B_80121AF0 != NULL) && (B_80121AF0->unk_58 != NULL)) { if ((B_80121220 != NULL) && (B_80121220->unk_58 != NULL)) {
B_80121AF0->unk_58(&sJpnMessageEntryTablePtr, &sNesMessageEntryTablePtr, &sStaffMessageEntryTablePtr); B_80121220->unk_58(&sJpnMessageEntryTablePtr, &sNesMessageEntryTablePtr, &sStaffMessageEntryTablePtr);
} }
#endif #endif
} }