diff options
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_message.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/code/z_message.c b/src/code/z_message.c index 20ce6279e..375491e82 100644 --- a/src/code/z_message.c +++ b/src/code/z_message.c @@ -3246,7 +3246,7 @@ void Message_OpenText(PlayState* play, u16 textId) { } } -void func_801514B0(PlayState* play, u16 arg1, u8 arg2) { +void Message_PauseMenu_ShowDescription(PlayState* play, u16 textId, u8 textBoxPos) { MessageContext* msgCtx = &play->msgCtx; Font* font = &msgCtx->font; Player* player = GET_PLAYER(play); @@ -3276,19 +3276,19 @@ void func_801514B0(PlayState* play, u16 arg1, u8 arg2) { sCharTexScale = temp / msgCtx->textCharScale; D_801F6B08 = temp / 1; - if ((arg1 == 0x1709) && (player->transformation == 3)) { - arg1 = 0x1705; + if ((textId == 0x1709) && (player->transformation == PLAYER_FORM_DEKU)) { + textId = 0x1705; } - msgCtx->currentTextId = arg1; + msgCtx->currentTextId = textId; if (gSaveContext.options.language == LANGUAGE_JPN) { - Message_FindMessage(play, arg1); + Message_FindMessage(play, textId); msgCtx->msgLength = font->messageEnd; DmaMgr_RequestSync(&font->msgBuf, SEGMENT_ROM_START(message_data_static) + font->messageStart, font->messageEnd); } else { - Message_FindMessageNES(play, arg1); + Message_FindMessageNES(play, textId); msgCtx->msgLength = font->messageEnd; DmaMgr_RequestSync(&font->msgBuf, SEGMENT_ROM_START(message_data_static) + font->messageStart, font->messageEnd); @@ -3302,7 +3302,7 @@ void func_801514B0(PlayState* play, u16 arg1, u8 arg2) { msgCtx->unk11F08 = font->msgBuf.wchar[msgCtx->msgBufPos]; msgCtx->unk11F18 = (msgCtx->unk11F08 & 0xF000) >> 0xC; msgCtx->textBoxType = TEXTBOX_TYPE_9; - msgCtx->textBoxPos = arg2; + msgCtx->textBoxPos = textBoxPos; msgCtx->unk11F0C = msgCtx->unk11F08 & 0xF; msgCtx->textUnskippable = true; DmaMgr_RequestSync(msgCtx->textboxSegment, SEGMENT_ROM_START(message_static) + (D_801CFC78[0] * 0x1000), 0x1000); |