summaryrefslogtreecommitdiff
path: root/src/code/z_message.c
diff options
context:
space:
mode:
authorRevoSucks <projectrevotpp@hotmail.com>2023-10-31 21:26:08 -0400
committerRevoSucks <projectrevotpp@hotmail.com>2023-10-31 21:26:08 -0400
commitb1a5cf8ede90f6ced7feaed7723d7e8b448e3597 (patch)
treef8ed3e87059c9c5bf06037eccfab79f780bd4041 /src/code/z_message.c
parent28ebd27e5f6c154ee8af6a97c34efd08fde48ace (diff)
parentdbedc294294ab569a3dcbb0a03dac7d2a51066b3 (diff)
z_parameter
Diffstat (limited to 'src/code/z_message.c')
-rw-r--r--src/code/z_message.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/code/z_message.c b/src/code/z_message.c
index 06ac6c23d..ff16d258a 100644
--- a/src/code/z_message.c
+++ b/src/code/z_message.c
@@ -1245,7 +1245,7 @@ void Message_DrawTextDefault(PlayState* play, Gfx** gfxP) {
msgCtx->stateTimer = msgCtx->decodedBuffer.wchar[++i];
Font_LoadMessageBoxEndIcon(&play->msgCtx.font, 1);
if (play->csCtx.state == CS_STATE_IDLE) {
- func_8011552C(play, DO_ACTION_RETURN);
+ Interface_SetAButtonDoAction(play, DO_ACTION_RETURN);
}
}
*gfxP = gfx;
@@ -1258,7 +1258,7 @@ void Message_DrawTextDefault(PlayState* play, Gfx** gfxP) {
msgCtx->stateTimer = msgCtx->decodedBuffer.wchar[++i];
Font_LoadMessageBoxEndIcon(&play->msgCtx.font, 1);
if (play->csCtx.state == CS_STATE_IDLE) {
- func_8011552C(play, DO_ACTION_RETURN);
+ Interface_SetAButtonDoAction(play, DO_ACTION_RETURN);
}
}
*gfxP = gfx;
@@ -1416,7 +1416,7 @@ void Message_DrawTextDefault(PlayState* play, Gfx** gfxP) {
Font_LoadMessageBoxEndIcon(font, 0);
}
if (play->csCtx.state == CS_STATE_IDLE) {
- func_8011552C(play, DO_ACTION_RETURN);
+ Interface_SetAButtonDoAction(play, DO_ACTION_RETURN);
}
} else {
Audio_PlaySfx(NA_SE_NONE);
@@ -3106,7 +3106,7 @@ void Message_OpenText(PlayState* play, u16 textId) {
}
if (textId == 0xFF) {
- func_80115844(play, DO_ACTION_STOP);
+ Interface_LoadBButtonDoActionLabel(play, DO_ACTION_STOP);
play->msgCtx.hudVisibility = gSaveContext.hudVisibility;
Interface_SetHudVisibility(HUD_VISIBILITY_A_B_C);
gSaveContext.save.unk_06 = 20;
@@ -3337,9 +3337,9 @@ void Message_ContinueTextbox(PlayState* play, u16 textId) {
if (interfaceCtx->unk_222 == 0) {
if (textId != 0x1B93) {
- func_8011552C(play, DO_ACTION_NEXT);
+ Interface_SetAButtonDoAction(play, DO_ACTION_NEXT);
} else if (textId != 0xF8) {
- func_8011552C(play, DO_ACTION_DECIDE);
+ Interface_SetAButtonDoAction(play, DO_ACTION_DECIDE);
}
}
msgCtx->textboxColorAlphaCurrent = msgCtx->textboxColorAlphaTarget;
@@ -3566,7 +3566,7 @@ void Message_DisplayOcarinaStaffImpl(PlayState* play, u16 ocarinaAction) {
msgCtx->textboxColorAlphaCurrent = msgCtx->textboxColorAlphaTarget;
if (!noStop) {
- func_80115844(play, DO_ACTION_STOP);
+ Interface_LoadBButtonDoActionLabel(play, DO_ACTION_STOP);
noStop = gSaveContext.hudVisibility;
Interface_SetHudVisibility(HUD_VISIBILITY_B_ALT);
gSaveContext.hudVisibility = noStop;
@@ -5405,9 +5405,9 @@ void Message_Update(PlayState* play) {
msgCtx->msgMode = MSGMODE_TEXT_NEXT_MSG;
if (!pauseCtx->itemDescriptionOn) {
if (msgCtx->currentTextId == 0xFF) {
- func_8011552C(play, DO_ACTION_STOP);
+ Interface_SetAButtonDoAction(play, DO_ACTION_STOP);
} else if (msgCtx->currentTextId != 0xF8) {
- func_8011552C(play, DO_ACTION_NEXT);
+ Interface_SetAButtonDoAction(play, DO_ACTION_NEXT);
}
}
break;
@@ -5698,7 +5698,7 @@ void Message_Update(PlayState* play) {
Message_CloseTextbox(play);
play->msgCtx.ocarinaMode = OCARINA_MODE_END;
gSaveContext.prevHudVisibility = HUD_VISIBILITY_A_B;
- func_80115844(play, DO_ACTION_STOP);
+ Interface_LoadBButtonDoActionLabel(play, DO_ACTION_STOP);
GameState_SetFramerateDivisor(&play->state, 2);
if (ShrinkWindow_Letterbox_GetSizeTarget() != 0) {
ShrinkWindow_Letterbox_SetSizeTarget(0);
@@ -5759,7 +5759,7 @@ void Message_Update(PlayState* play) {
XREG(31) = 0;
if (pauseCtx->itemDescriptionOn) {
- func_8011552C(play, DO_ACTION_INFO);
+ Interface_SetAButtonDoAction(play, DO_ACTION_INFO);
pauseCtx->itemDescriptionOn = false;
}