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

Various SFX fixes (#237)

Browse source 
* Various SFX fixes

* Fix sfx references in z_en_zl2.c
This commit is contained in:
Roman971 2020-07-05 05:30:21 +02:00 • committed by GitHub
parent a5aee3d691
commit 61544b873d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
45 changed files with 362 additions and 342 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/code/z_play.c
View file

@ -404,8 +404,8 @@ void Gameplay_Init(GlobalContext* globalCtx) {
Interface_SetSceneRestrictions(globalCtx);
func_800758AC(globalCtx);
gSaveContext.seqIndex = globalCtx->soundCtx.musicSeq;
gSaveContext.nightSeqIndex = globalCtx->soundCtx.nighttimeSFX;
gSaveContext.seqIndex = globalCtx->soundCtx.seqIndex;
gSaveContext.nightSeqIndex = globalCtx->soundCtx.nightSeqIndex;
func_8002DF18(globalCtx, PLAYER);
func_800A390C(globalCtx, &globalCtx->animationCtx);
gSaveContext.respawnFlag = 0;
@ -714,7 +714,7 @@ void Gameplay_Update(GlobalContext* globalCtx) {
break;
case 13:
Audio_PlaySoundGeneral(0x20C0, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EV_SAND_STORM - SFX_FLAG, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
if (globalCtx->sceneLoadFlag == -0x14) {
if (globalCtx->envCtx.unk_E7 < 0x6E) {
gTrnsnUnkState = 0;
@ -747,7 +747,7 @@ void Gameplay_Update(GlobalContext* globalCtx) {
break;
case 15:
Audio_PlaySoundGeneral(0x20C0, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EV_SAND_STORM - SFX_FLAG, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
if (globalCtx->sceneLoadFlag == -0x14) {
if (globalCtx->envCtx.unk_E7 <= 0) {
gTrnsnUnkState = 0;