diff options
| author | fig02 <fig02srl@gmail.com> | 2022-12-20 17:03:41 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-20 23:03:41 +0100 |
| commit | 1c6878b070b6dcafaff89a843d6e508a09402a1b (patch) | |
| tree | 2150931c8783dd7a251ef7b9a3da233d7c47be18 /src/code | |
| parent | 7100b17e5f23e7c8fdc71ea4d691891b1c329067 (diff) | |
Name `Message_StartOcarina` and related things (#1473)
* name functions and msg ctx var
* start ocarina
* clarifying comments
* typo
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_demo.c | 4 | ||||
| -rw-r--r-- | src/code/z_message_PAL.c | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/code/z_demo.c b/src/code/z_demo.c index 4b3a23994..14f72061a 100644 --- a/src/code/z_demo.c +++ b/src/code/z_demo.c @@ -1510,7 +1510,7 @@ void Cutscene_Command_Textbox(PlayState* play, CutsceneContext* csCtx, CsCmdText } else { if (D_8011E1C4 != cmd->base) { D_8011E1C4 = cmd->base; - func_8010BD58(play, cmd->base); + Message_StartOcarina(play, cmd->base); return; } } @@ -1549,7 +1549,7 @@ void Cutscene_Command_Textbox(PlayState* play, CutsceneContext* csCtx, CsCmdText if (dialogState == TEXT_STATE_EVENT) { if (Message_ShouldAdvance(play)) { - func_8010BD58(play, cmd->base); + Message_StartOcarina(play, cmd->base); } } } diff --git a/src/code/z_message_PAL.c b/src/code/z_message_PAL.c index 30c0d958f..4694e24f9 100644 --- a/src/code/z_message_PAL.c +++ b/src/code/z_message_PAL.c @@ -1735,7 +1735,7 @@ void Message_ContinueTextbox(PlayState* play, u16 textId) { msgCtx->textboxColorAlphaCurrent = msgCtx->textboxColorAlphaTarget; } -void Message_StartOcarina(PlayState* play, u16 ocarinaActionId) { +void Message_StartOcarinaImpl(PlayState* play, u16 ocarinaActionId) { static u16 sOcarinaSongFlagsMap[] = { (1 << OCARINA_SONG_MINUET), (1 << OCARINA_SONG_BOLERO), @@ -1873,14 +1873,14 @@ void Message_StartOcarina(PlayState* play, u16 ocarinaActionId) { } } -void func_8010BD58(PlayState* play, u16 ocarinaActionId) { - play->msgCtx.unk_E40E = 0; - Message_StartOcarina(play, ocarinaActionId); +void Message_StartOcarina(PlayState* play, u16 ocarinaActionId) { + play->msgCtx.disableSunsSong = false; + Message_StartOcarinaImpl(play, ocarinaActionId); } -void func_8010BD88(PlayState* play, u16 ocarinaActionId) { - play->msgCtx.unk_E40E = 1; - Message_StartOcarina(play, ocarinaActionId); +void Message_StartOcarinaSunsSongDisabled(PlayState* play, u16 ocarinaActionId) { + play->msgCtx.disableSunsSong = true; + Message_StartOcarinaImpl(play, ocarinaActionId); } u8 Message_GetState(MessageContext* msgCtx) { @@ -2577,7 +2577,7 @@ void Message_DrawMain(PlayState* play, Gfx** p) { case MSGMODE_OCARINA_AWAIT_INPUT: Message_DrawText(play, &gfx); if (Message_ShouldAdvance(play)) { - func_8010BD58(play, msgCtx->ocarinaAction); + Message_StartOcarina(play, msgCtx->ocarinaAction); } break; case MSGMODE_SCARECROW_LONG_RECORDING_START: |