diff options
| author | Alejandro Javier Asenjo Nitti <alejandro.asenjo88@gmail.com> | 2023-11-06 15:30:37 -0300 |
|---|---|---|
| committer | Alejandro Javier Asenjo Nitti <alejandro.asenjo88@gmail.com> | 2023-11-06 15:30:37 -0300 |
| commit | a296c79b47009a70c556bff3dbb77f31aa792ee3 (patch) | |
| tree | 97c27e5290ef1f7065fa52719c708b82fc5a4c34 /src/code | |
| parent | 55473dd84e07a68f40f04d41829b42a082cee066 (diff) | |
Message_DrawTextCredits matching
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_message_staff.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/src/code/z_message_staff.c b/src/code/z_message_staff.c index a093ef5c1..6b94d7719 100644 --- a/src/code/z_message_staff.c +++ b/src/code/z_message_staff.c @@ -35,12 +35,9 @@ f32 sCreditsFontWidths[144] = { 14.0f, 14.0f, 14.0f, 14.0f, 14.0f, 14.0f, 14.0f, 14.0f, 14.0f, 14.0f, 14.0f, 14.0f, 14.0f, 14.0f, 14.0f, 14.0f, }; -#ifdef NON_MATCHING -// https://decomp.me/scratch/yc8Or -// v0/v1 swap between `character` and `i` void Message_DrawTextCredits(PlayState* play, Gfx** gfxP) { MessageContext* msgCtx = &play->msgCtx; - u16 lookAheadCharacter; + u16 pad; u16 j; u16 i; u16 sfxHi; @@ -122,14 +119,13 @@ void Message_DrawTextCredits(PlayState* play, Gfx** gfxP) { ((msgCtx->msgMode >= MSGMODE_OCARINA_STARTING) && (msgCtx->msgMode <= MSGMODE_26)))) { j = i; while (true) { - lookAheadCharacter = msgCtx->decodedBuffer.schar[j]; - if (lookAheadCharacter == 6) { + character = msgCtx->decodedBuffer.schar[j]; + if (character == 6) { j += 2; continue; } - if ((lookAheadCharacter != 9) && (lookAheadCharacter != 0xA) && (lookAheadCharacter != 0xB) && - (lookAheadCharacter != 0xC) && (lookAheadCharacter != 0xD) && (lookAheadCharacter != 4) && - (lookAheadCharacter != 2)) { + if ((character != 9) && (character != 0xA) && (character != 0xB) && (character != 0xC) && + (character != 0xD) && (character != 4) && (character != 2)) { j++; continue; } @@ -260,7 +256,7 @@ void Message_DrawTextCredits(PlayState* play, Gfx** gfxP) { Audio_PlaySfx(NA_SE_SY_MESSAGE_END); Font_LoadMessageBoxEndIcon(font, 1); if (play->csCtx.state == CS_STATE_IDLE) { - func_8011552C(play, DO_ACTION_RETURN); + Interface_SetAButtonDoAction(play, DO_ACTION_RETURN); } } } @@ -282,7 +278,7 @@ void Message_DrawTextCredits(PlayState* play, Gfx** gfxP) { msgCtx->stateTimer = msgCtx->decodedBuffer.schar[++i]; Font_LoadMessageBoxEndIcon(font, 1); if (play->csCtx.state == CS_STATE_IDLE) { - func_8011552C(play, DO_ACTION_RETURN); + Interface_SetAButtonDoAction(play, DO_ACTION_RETURN); } } *gfxP = gfx; @@ -329,9 +325,6 @@ void Message_DrawTextCredits(PlayState* play, Gfx** gfxP) { *gfxP = gfx; } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/z_message_staff/Message_DrawTextCredits.s") -#endif void Message_DecodeCredits(PlayState* play) { u16 curChar; |