mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-14 20:05:02 +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

18
src/code/z_camera.c
View file

@ -6220,7 +6220,7 @@ s32 Camera_Demo5(Camera* camera) {
framesDiff = sDemo5PrevSfxFrame - camera->play->state.frames;
if ((framesDiff > 50) || (framesDiff < -50)) {
func_80078884((u32)camera->data1);
Sfx_PlaySfxCentered((u32)camera->data1);
}
sDemo5PrevSfxFrame = camera->play->state.frames;
@ -7456,11 +7456,11 @@ s32 Camera_DbgChangeMode(Camera* camera) {
if (!gDebugCamEnabled && camera->play->activeCamId == CAM_ID_MAIN) {
if (CHECK_BTN_ALL(D_8015BD7C->state.input[2].press.button, BTN_CUP)) {
osSyncPrintf("attention sound URGENCY\n");
func_80078884(NA_SE_SY_ATTENTION_URGENCY);
Sfx_PlaySfxCentered(NA_SE_SY_ATTENTION_URGENCY);
}
if (CHECK_BTN_ALL(D_8015BD7C->state.input[2].press.button, BTN_CDOWN)) {
osSyncPrintf("attention sound NORMAL\n");
func_80078884(NA_SE_SY_ATTENTION_ON);
Sfx_PlaySfxCentered(NA_SE_SY_ATTENTION_ON);
}
if (CHECK_BTN_ALL(D_8015BD7C->state.input[2].press.button, BTN_CRIGHT)) {
@ -7884,7 +7884,7 @@ s32 Camera_ChangeModeFlags(Camera* camera, s16 mode, u8 flags) {
if (!((sCameraSettings[camera->setting].unk_00 & 0x3FFFFFFF) & (1 << mode))) {
if (mode == CAM_MODE_FIRST_PERSON) {
osSyncPrintf("camera: error sound\n");
func_80078884(NA_SE_SY_ERROR);
Sfx_PlaySfxCentered(NA_SE_SY_ERROR);
}
if (camera->mode != CAM_MODE_NORMAL) {
@ -7972,20 +7972,20 @@ s32 Camera_ChangeModeFlags(Camera* camera, s16 mode, u8 flags) {
if (camera->status == CAM_STAT_ACTIVE) {
switch (modeChangeFlags) {
case 1:
func_80078884(0);
Sfx_PlaySfxCentered(0);
break;
case 2:
if (camera->play->roomCtx.curRoom.behaviorType1 == ROOM_BEHAVIOR_TYPE1_1) {
func_80078884(NA_SE_SY_ATTENTION_URGENCY);
Sfx_PlaySfxCentered(NA_SE_SY_ATTENTION_URGENCY);
} else {
func_80078884(NA_SE_SY_ATTENTION_ON);
Sfx_PlaySfxCentered(NA_SE_SY_ATTENTION_ON);
}
break;
case 4:
func_80078884(NA_SE_SY_ATTENTION_URGENCY);
Sfx_PlaySfxCentered(NA_SE_SY_ATTENTION_URGENCY);
break;
case 8:
func_80078884(NA_SE_SY_ATTENTION_ON);
Sfx_PlaySfxCentered(NA_SE_SY_ATTENTION_ON);
break;
}
}