mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-21 06:21:16 +00:00
Code Issues Projects Releases Wiki Activity

Document z_lib Sfx Functions (#1470)

Browse source 
* document lib sfx

* rename functions
This commit is contained in:
engineer124 2023-08-15 15:44:20 +10:00 • committed by GitHub
parent 18d609c1a3
commit b8aa2a251e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
112 changed files with 399 additions and 388 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/overlays/actors/ovl_En_Fr/z_en_fr.c
View file

@ -737,7 +737,7 @@ void EnFr_ChildSong(EnFr* this, PlayState* play) {
EnFr_SetupReward(this, play, false);
} else if (!FROG_HAS_SONG_BEEN_PLAYED(songIndex)) {
frog = sEnFrPointers.frogs[sSongToFrog[songIndex]];
func_80078884(NA_SE_SY_CORRECT_CHIME);
Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
if (frog->actionFunc == EnFr_ChooseJumpFromLogSpot) {
frog->isJumpingUp = true;
frog->isActive = true;
@ -855,7 +855,7 @@ s32 EnFr_IsFrogSongComplete(EnFr* this, PlayState* play) {
void EnFr_OcarinaMistake(EnFr* this, PlayState* play) {
Message_CloseTextbox(play);
this->reward = GI_NONE;
func_80078884(NA_SE_SY_OCARINA_ERROR);
Sfx_PlaySfxCentered(NA_SE_SY_OCARINA_ERROR);
AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_OFF);
sEnFrPointers.flags = 12;
EnFr_DeactivateButterfly();
@ -916,9 +916,9 @@ void EnFr_ContinueFrogSong(EnFr* this, PlayState* play) {
void EnFr_SetupReward(EnFr* this, PlayState* play, u8 unkCondition) {
EnFr_DeactivateButterfly();
if (unkCondition) {
func_80078884(NA_SE_SY_TRE_BOX_APPEAR);
Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR);
} else {
func_80078884(NA_SE_SY_CORRECT_CHIME);
Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
}
AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_OFF);