diff options
| author | Jordan Longstaff <JordanLongstaff@users.noreply.github.com> | 2025-12-06 17:36:31 -0500 |
|---|---|---|
| committer | Eblo <7004497+Eblo@users.noreply.github.com> | 2026-01-25 15:06:59 -0500 |
| commit | 5d4be44a22a0794633b3ca3e6678a672771fea39 (patch) | |
| tree | 5b32f2c7206589090342feb93901c5bb4e23ab92 /mm/src/code | |
| parent | 5a980f0f67b92bec102f135d2d32b0671945f43c (diff) | |
Document `func_80148CBC` (#1836)
* Document `func_80148CBC`
* Add doc comment
Diffstat (limited to 'mm/src/code')
| -rw-r--r-- | mm/src/code/z_message.c | 29 | ||||
| -rw-r--r-- | mm/src/code/z_message_nes.c | 12 |
2 files changed, 22 insertions, 19 deletions
diff --git a/mm/src/code/z_message.c b/mm/src/code/z_message.c index 782ca9f6f..422eee72f 100644 --- a/mm/src/code/z_message.c +++ b/mm/src/code/z_message.c @@ -665,14 +665,17 @@ void Message_HandleChoiceSelection(PlayState* play, u8 numChoices) { } } -void func_80148CBC(PlayState* play, Gfx** gfxP, u8 arg2) { +/** + * Draws the arrow icon next to the currently selected choice. + */ +void Message_DrawChoiceIcon(PlayState* play, Gfx** gfxP, u8 numChoices) { MessageContext* msgCtx = &play->msgCtx; msgCtx->textPosX = 48; - if (arg2 == 1) { - msgCtx->textPosY = msgCtx->unk11FFE[1 + msgCtx->choiceIndex]; + if (numChoices == 1) { + msgCtx->textPosY = msgCtx->choicePosY[1 + msgCtx->choiceIndex]; } else { - msgCtx->textPosY = msgCtx->unk11FFE[msgCtx->choiceIndex]; + msgCtx->textPosY = msgCtx->choicePosY[msgCtx->choiceIndex]; } Message_DrawTextboxIcon(play, gfxP, msgCtx->textPosX, msgCtx->textPosY); } @@ -5292,15 +5295,15 @@ void Message_DrawMain(PlayState* play, Gfx** gfxP) { switch (msgCtx->textboxEndType) { case TEXTBOX_ENDTYPE_TWO_CHOICE: - func_80148CBC(play, &gfx, 1); + Message_DrawChoiceIcon(play, &gfx, 1); break; case TEXTBOX_ENDTYPE_THREE_CHOICE: - func_80148CBC(play, &gfx, 2); + Message_DrawChoiceIcon(play, &gfx, 2); break; case TEXTBOX_ENDTYPE_12: - func_80148CBC(play, &gfx, 1); + Message_DrawChoiceIcon(play, &gfx, 1); break; case TEXTBOX_ENDTYPE_PERSISTENT: @@ -5618,13 +5621,13 @@ void Message_Update(PlayState* play) { msgCtx->textboxXTarget = sTextboxXPositions[var_v1]; if ((gSaveContext.options.language == LANGUAGE_JPN) && !msgCtx->textIsCredits) { - msgCtx->unk11FFE[0] = (s16)(msgCtx->textboxYTarget + 7); - msgCtx->unk11FFE[1] = (s16)(msgCtx->textboxYTarget + 25); - msgCtx->unk11FFE[2] = (s16)(msgCtx->textboxYTarget + 43); + msgCtx->choicePosY[0] = (s16)(msgCtx->textboxYTarget + 7); + msgCtx->choicePosY[1] = (s16)(msgCtx->textboxYTarget + 25); + msgCtx->choicePosY[2] = (s16)(msgCtx->textboxYTarget + 43); } else { - msgCtx->unk11FFE[0] = (s16)(msgCtx->textboxYTarget + 20); - msgCtx->unk11FFE[1] = (s16)(msgCtx->textboxYTarget + 32); - msgCtx->unk11FFE[2] = (s16)(msgCtx->textboxYTarget + 44); + msgCtx->choicePosY[0] = (s16)(msgCtx->textboxYTarget + 20); + msgCtx->choicePosY[1] = (s16)(msgCtx->textboxYTarget + 32); + msgCtx->choicePosY[2] = (s16)(msgCtx->textboxYTarget + 44); } if ((msgCtx->textBoxType == TEXTBOX_TYPE_4) || (msgCtx->textBoxType == TEXTBOX_TYPE_5)) { diff --git a/mm/src/code/z_message_nes.c b/mm/src/code/z_message_nes.c index ec8b8d0b7..6f1845213 100644 --- a/mm/src/code/z_message_nes.c +++ b/mm/src/code/z_message_nes.c @@ -773,9 +773,9 @@ void Message_DrawTextNES(PlayState* play, Gfx** gfxP, u16 textDrawPos) { msgCtx->stateTimer = 4; Font_LoadMessageBoxEndIcon(font, 2); if (msgCtx->unk120D8 != 3) { - msgCtx->unk11FFE[0] = (s16)(msgCtx->textboxYTarget + 14); - msgCtx->unk11FFE[1] = (s16)(msgCtx->textboxYTarget + 26); - msgCtx->unk11FFE[2] = (s16)(msgCtx->textboxYTarget + 38); + msgCtx->choicePosY[0] = (s16)(msgCtx->textboxYTarget + 14); + msgCtx->choicePosY[1] = (s16)(msgCtx->textboxYTarget + 26); + msgCtx->choicePosY[2] = (s16)(msgCtx->textboxYTarget + 38); } } break; @@ -788,9 +788,9 @@ void Message_DrawTextNES(PlayState* play, Gfx** gfxP, u16 textDrawPos) { msgCtx->stateTimer = 4; Font_LoadMessageBoxEndIcon(font, 2); if (msgCtx->unk120D8 != 3) { - msgCtx->unk11FFE[0] = (s16)(msgCtx->textboxYTarget + 14); - msgCtx->unk11FFE[1] = (s16)(msgCtx->textboxYTarget + 26); - msgCtx->unk11FFE[2] = (s16)(msgCtx->textboxYTarget + 38); + msgCtx->choicePosY[0] = (s16)(msgCtx->textboxYTarget + 14); + msgCtx->choicePosY[1] = (s16)(msgCtx->textboxYTarget + 26); + msgCtx->choicePosY[2] = (s16)(msgCtx->textboxYTarget + 38); } } break; |