mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-21 22:41:14 +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/overlays/actors/ovl_En_Fu/z_en_fu.c
View file

@ -191,7 +191,7 @@ void EnFu_WaitForPlayback(EnFu* this, PlayState* play) {
player->stateFlags2 |= PLAYER_STATE2_23;
// if dialog state is 7, player has played back the song
if (Message_GetState(&play->msgCtx) == TEXT_STATE_SONG_DEMO_DONE) {
func_8010BD58(play, OCARINA_ACTION_PLAYBACK_STORMS);
Message_StartOcarina(play, OCARINA_ACTION_PLAYBACK_STORMS);
this->actionFunc = func_80A1DBD4;
}
}
@ -205,7 +205,7 @@ void EnFu_TeachSong(EnFu* this, PlayState* play) {
this->behaviorFlags &= ~FU_WAIT;
// Ocarina is set to harp here but is immediately overwritten to the grind organ in the message system
AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_HARP);
func_8010BD58(play, OCARINA_ACTION_TEACH_STORMS);
Message_StartOcarina(play, OCARINA_ACTION_TEACH_STORMS);
this->actionFunc = EnFu_WaitForPlayback;
}
}