izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Support loading credits text, take 2 (#133)

Browse Source 
* support loading credits tex

* code review feedback
This commit is contained in:
Archez
2024-05-22 09:04:59 -05:00
committed by Garrett Cox
parent 48f197c049
commit cc465fe043
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mm/src/code/z_message.c
+4 -4
View File
@@ -3359,7 +3359,9 @@ void Message_OpenText(PlayState* play, u16 textId) {
// BENTODO all of these
if (msgCtx->textIsCredits) {
Message_FindCreditsMessage(play, textId);
msgCtx->msgLength = font->messageEnd;
MessageTableEntry* msgEntry = (MessageTableEntry*)font->messageStart;
msgCtx->msgLength = msgEntry->msgSize;
memcpy(&font->msgBuf, msgEntry->segment, msgEntry->msgSize);
//DmaMgr_SendRequest0(&font->msgBuf, SEGMENT_ROM_START(staff_message_data_static) + font->messageStart,
// font->messageEnd);
} else if (gSaveContext.options.language == LANGUAGE_JPN) {
@@ -3375,7 +3377,7 @@ void Message_OpenText(PlayState* play, u16 textId) {
//msgCtx->msgLength = font->messageEnd;
//DmaMgr_SendRequest0(&font->msgBuf, SEGMENT_ROM_START(message_data_static) + font->messageStart,
// font->messageEnd);
} //
}
msgCtx->choiceNum = 0;
msgCtx->textUnskippable = false;
@@ -4365,8 +4367,6 @@ void Message_DrawMain(PlayState* play, Gfx** gfxP) {
s32 j;
s16 temp_v0_33;
s16 temp;
// BENTODO
msgCtx->textIsCredits = false;
gfx = *gfxP;
mm/src/code/z_message_staff.c
+2 -5
View File
@@ -12,12 +12,9 @@ void Message_FindCreditsMessage(PlayState* play, u16 textId) {
while (msgEntry->textId != 0xFFFF) {
if (msgEntry->textId == textId) {
foundSegment = msgEntry->segment;
// 2SH2 [Port] Just assign the msgEntry, we don't need to change the messageStart and messageEnd
font->messageStart = msgEntry;
font->charBuf[font->unk_11D88][0] = msgEntry->typePos;
msgEntry++;
nextSegment = msgEntry->segment;
font->messageStart = foundSegment - segment;
font->messageEnd = nextSegment - foundSegment;
break;
}
msgEntry++;