mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-04 06:54:33 +00:00
Code Issues Projects Releases Wiki Activity

Name Message_StartOcarina and related things (#1473)

Browse source 
* name functions and msg ctx var

* start ocarina

* clarifying comments

* typo
This commit is contained in:
fig02 2022-12-20 17:03:41 -05:00 • committed by GitHub
parent 7100b17e5f
commit 1c6878b070
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 43 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/code/z_demo.c
View file

@ -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);
}
}
}

16
src/code/z_message_PAL.c
View file

@ -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: